summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in4
-rwxr-xr-xconfigure15
-rw-r--r--configure.in5
-rw-r--r--lang/Makefile4
-rw-r--r--src/Makefile11
-rw-r--r--src/core/Makefile7
-rw-r--r--src/modules/Makefile7
-rw-r--r--src/protocol/Makefile9
-rw-r--r--src/tools/Makefile4
9 files changed, 45 insertions, 21 deletions
diff --git a/Makefile.in b/Makefile.in
index 55bbd3376..86bab262a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,7 @@ PROFILE=-pg
LDPROFILE=
SHELL=/bin/sh
BINDEST=@BINDEST@
+MAKEBIN=@MAKEBIN@
DATDEST=@DATDEST@
INSTALL=@INSTALL@
RM=@RM@
@@ -25,7 +26,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \
+ 'MAKEBIN=${MAKEBIN}'
build: language headers
@${MAKE} -C src ${MAKEARGS} all
diff --git a/configure b/configure
index 86160fb7d..b0e45b19f 100755
--- a/configure
+++ b/configure
@@ -670,6 +670,7 @@ SHARED
MODULEFLAGS
RUNGROUP
BINDEST
+MAKEBIN
DATDEST
MODULE_PATH
LIBOBJS
@@ -1257,6 +1258,7 @@ Optional Packages:
--with-rungroup=group Specify the rungroup for anope
--with-permissions=permissions Specify the default permissions for anope
--with-bindir=bindir Specify the default binary dir for anope
+--with-makebin=run-cc.pl Specify the default make binary to use
--with-datadir=datadir Specify the location of the services data folder
Some influential environment variables:
@@ -7764,6 +7766,16 @@ _ACEOF
fi
+MAKEBIN=`pwd`/run-cc.pl
+
+
+# Check whether --with-makebin was given.
+if test "${with_makebin+set}" = set; then
+ withval=$with_makebin; MAKEBIN=$withval
+fi
+
+
+
@@ -8465,13 +8477,14 @@ SHARED!$SHARED$ac_delim
MODULEFLAGS!$MODULEFLAGS$ac_delim
RUNGROUP!$RUNGROUP$ac_delim
BINDEST!$BINDEST$ac_delim
+MAKEBIN!$MAKEBIN$ac_delim
DATDEST!$DATDEST$ac_delim
MODULE_PATH!$MODULE_PATH$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index 37e618448..7bbc76488 100644
--- a/configure.in
+++ b/configure.in
@@ -254,7 +254,12 @@ AC_ARG_WITH(bindir, [ --with-bindir=bindir Specify the default binary dir fo
MODULE_PATH=${withval}/modules/
])
+MAKEBIN=`pwd`/run-cc.pl
+
+AC_ARG_WITH(makebin, [--with-makebin=run-cc.pl Specify the default make binary to use],[MAKEBIN=$withval])
+
AC_SUBST(BINDEST)
+AC_SUBST(MAKEBIN)
AC_ARG_WITH(datadir, [ --with-datadir=datadir Specify the location of the services data folder], [
AC_DEFINE_UNQUOTED(SERVICES_DIR,"$withval","services bin dir")
diff --git a/lang/Makefile b/lang/Makefile
index bcc77c6ef..2a012be32 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -4,7 +4,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
- 'RUNGROUP=${RUNGROUP}'
+ 'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
LANGOBJS = cat de en_us es fr gr hun it nl pl pt ru tr
LANGSRCS = cat.l de.l en_us.l es.l fr.l gr.l hun.l it.l nl.l pl.l pt.l ru.l tr.l
@@ -71,7 +71,7 @@ tr: tr.l langcomp index
@./langcomp $@.l
langcomp: langcomp.c
- @../run-cc.pl $(CC) $(CFLAGS) langcomp.c -o $@
+ @$(MAKEBIN) $(CC) $(CFLAGS) langcomp.c -o $@
language.h: index Makefile
diff --git a/src/Makefile b/src/Makefile
index b70acb6ca..7973ba4d7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,13 +18,14 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \
+ 'MAKEBIN=${MAKEBIN}'
.c.o:
- @../run-cc.pl $(CC) $(CFLAGS) -I../include/ -c $<
+ @$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
.cpp.o:
- @../run-cc.pl $(CC) $(CFLAGS) -I../include/ -c $<
+ @$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
all: services
@@ -32,7 +33,7 @@ distclean: spotless
distclean_modules: clean_modules spotless
services: $(OBJS) mod_version
- @../run-cc.pl $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
+ @$(MAKEBIN) $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
$(OBJS): Makefile
actions.o: actions.c $(INCLUDES)
@@ -76,7 +77,7 @@ users.o: users.c $(INCLUDES)
vsnprintf.o: vsnprintf.c $(INCLUDES)
mod_version: mod_version.c $(INCLUDES)
- @../run-cc.pl $(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
+ @$(MAKEBIN) $(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
modules: DUMMY
@modules/configure modules
diff --git a/src/core/Makefile b/src/core/Makefile
index c989ac026..1fba36e5e 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -5,7 +5,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' \
+ 'MODULEFLAGS=${MODULEFLAGS}' 'MAKEBIN=${MAKEBIN}'
OBJECTS= $(SRCS:.c=.o)
SO_FILES=$(OBJECTS:.o=.s)
@@ -21,10 +22,10 @@ install:
distclean: spotless
.c.o:
- @../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+ @$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
- @../../run-cc.pl $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+ @$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
@$(TOUCH) $*.s
subs:
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 59a241694..dce685230 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -5,7 +5,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
+ 'MAKEBIN=${MAKEBIN}'
OBJECTS= $(SRCS:.c=.o)
SO_FILES=$(OBJECTS:.o=.s)
@@ -24,10 +25,10 @@ install:
distclean: spotless
.c.o:
- @../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+ @$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
- @../../run-cc.pl $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+ @$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
@$(TOUCH) $*.s
subs:
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index d49a69be5..b1db60771 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -5,7 +5,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
- 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
+ 'MAKEBIN=${MAKEBIN}'
OBJECTS= $(SRCS:.c=.o)
OBJECTS+= $(SRCS:.cpp=.o)
@@ -22,13 +23,13 @@ install:
distclean: clean spotless
.c.o:
- @../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+ @$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.cpp.o:
- @../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+ @$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
- @../../run-cc.pl $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+ @$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
@$(TOUCH) $*.s
subs:
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 2b0679dda..5dfccf9cc 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -7,10 +7,10 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
- 'RUNGROUP=${RUNGROUP}'
+ 'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
.c.o:
- @../../run-cc.pl $(CC) $(CFLAGS) -I../include/ -c $<
+ @$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
all: ${OBJS}
generated by cgit (git 2.34.1) at 2025-06-17 19:23:24 +0000