Modifications to the Autotools build system to try to make it work with the changes made from CMake, still untested (again, don't use this commit).

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1877 5417fbe8-f217-4b02-8779-1006273d7864

Config

@@ -36,7 +36,7 @@ Load_Cache () {
 	fi
 }
 
-Run_CMake () {
+Run_Build_System () {
 	WITH_INST=""
 	WITH_RUN=""
 	WITH_PERM=""
@@ -45,41 +45,73 @@ Run_CMake () {
 	GEN_TYPE=""
 
 	if [ "$INSTDEST" != "" ] ; then
-		WITH_INST="-DINSTDIR:STRING=$INSTDEST"
+		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
+			WITH_INST="-DINSTDIR:STRING=$INSTDEST"
+		else
+			WITH_INST="--with-instdir=$INSTDIR"
+		fi
 	fi
 
 	if [ "$RUNGROUP" != "" ] ; then
-		WITH_RUN="-DRUNGROUP:STRING=$RUNGROUP"
+		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
+			WITH_RUN="-DRUNGROUP:STRING=$RUNGROUP"
+		else
+			WITH_RUN="--with-rungroup=$RUNGROUP"
+		fi
 	fi
 
 	if [ "$UMASK" != "" ] ; then
-		WITH_PERM="-DDEFUMASK:STRING=$UMASK"
+		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
+			WITH_PERM="-DDEFUMASK:STRING=$UMASK"
+		else
+			WITH_PERM="--with-permissions=$UMASK"
+		fi
 	fi
 
 	if [ "$DEBUG" = "yes" ] ; then
-		BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=DEBUG"
+		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
+			BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=DEBUG"
+		else
+			BUILD_TYPE="--with-debugsym"
+		fi
 	else
-		BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=RELEASE"
+		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
+			BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=RELEASE"
+		fi
 	fi
 
 	if [ "$USE_RUN_CC_PL" = "yes" ] ; then
-		RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=ON"
+		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
+			RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=ON"
+		else
+			RUN_CC_PL="--with-makebin=run-cc.pl"
+		fi
 	else
-		RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=OFF"
+		if [ "$BUILD_SYSTEM" = "cmake" ] ; then
+			RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=OFF"
+		else
+			RUN_CC_PL="--with-makebin="
+		fi
 	fi
 
-	case `uname -s` in
-		MINGW*)
-			GEN_TYPE="-G\"MSYS Makefiles\""
-			;;
-	esac
+	if [ "$BUILD_SYSTEM" = "cmake" ] ; then
+		case `uname -s` in
+			MINGW*)
+				GEN_TYPE="-G\"MSYS Makefiles\""
+				;;
+		esac
 
-	echo "cmake $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $SOURCE_DIR"
+		echo "cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $SOURCE_DIR"
 
-	cmake $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $SOURCE_DIR
+		cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $SOURCE_DIR
 
-	echo ""
-	echo "Now run make to build Anope."
+		echo ""
+		echo "Now run make to build Anope."
+	else
+		echo "./configure $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL"
+
+		./configure $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL
+	fi
 }
 
 ECHO2SUF=''
@@ -99,6 +131,7 @@ export ECHO2 ECHO2SUF
 # Init values
 ###########################################################################
 
+BUILD_SYSTEM="cmake"
 INSTDEST=$HOME/services
 RUNGROUP=
 UMASK=
@@ -127,7 +160,7 @@ while [ $# -ge 1 ] ; do
 	elif [ $1 = "-quick" -o $1 = "-q" ] ; then
 		Load_Cache
 		if [ "$CAN_QUICK" = "yes" ] ; then
-			Run_CMake
+			Run_Build_System
 		else
 			echo ""
 			echo "Can't find cache file (config.cache), aborting..."
@@ -175,6 +208,28 @@ export ok INPUT
 
 ok=0
 echo "Note: press Return for the default, or enter a new value."
+echo "Are you using configure or cmake?"
+while [ $ok -qe 0 ] ; do
+	echo2 "[$BUILD_SYSTEM] "
+	if read INPUT ; then : ; else echo "" ; exit 1 ; fi
+	if [ ! "$INPUT" ] ; then
+		INPUT=$BUILD_SYSTEM
+	fi
+	case $INPUT in
+		cmake)
+			ok=1
+			;;
+		configure)
+			ok=1
+			;;
+		*)
+			echo "That is not a valid choice!"
+			ok=0
+			;;
+	esac
+done
+
+ok=0
 echo "In what directory do you want the binaries to be installed?"
 while [ $ok -eq 0 ] ; do
 	echo2 "[$INSTDEST] "
@@ -310,6 +365,7 @@ echo ""
 echo2 "Saving configuration results in config.cache... "
 
 cat <<EOT >$SOURCE_DIR/config.cache
+BUILD_SYSTEM="$BUILD_SYSTEM"
 INSTDEST="$INSTDEST"
 RUNGROUP="$RUNGROUP"
 UMASK=$UMASK
@@ -320,7 +376,7 @@ echo "done."
 
 
 ################################################################################
-# Build the CMake string
+# Build the build system string
 ################################################################################
 
-Run_CMake
+Run_Build_System

Makefile.in

@@ -5,27 +5,25 @@ CFLAGS=@CFLAGS@ -Wall -ansi -pedantic -Wshadow
 PROFILE=-pg
 LDPROFILE=
 SHELL=/bin/sh
-BINDEST=@BINDEST@
+INSTDIR=@INSTDIR@
 MAKEBIN=@MAKEBIN@
-DATDEST=@DATDEST@
 INSTALL=@INSTALL@
 RM=@RM@
 CP=@CP@
 TOUCH=@TOUCH@
-MODULE_PATH=@MODULE_PATH@
 LDFLAGS=@LDFLAGS@
 RUNGROUP=@RUNGROUP@
 SHARED=@SHARED@
 MODULEFLAGS=@MODULEFLAGS@
 
-all:   language headers build core protocols tools modules 
+all:   language headers build core protocols tools modules
 profile: language headers profile_build profile_core profile_protocols profile_tools profile_modules
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-  	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
+  	   'RUNGROUP=${RUNGROUP}' \
 	   'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \
 	   'MAKEBIN=${MAKEBIN}'
 
@@ -56,11 +54,11 @@ profile_protocols: build
 	@src/protocol/configure src/protocol
 	@${MAKE} -C src/protocol ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all
 
-core: build 
+core: build
 	@echo "*** Building Core modules";
 	 @${MAKE} -C src ${MAKEARGS} core
 
-profile_core: build 
+profile_core: build
 	@echo "*** Building Core modules";
 	@${MAKE} -C src ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' core
 
@@ -88,7 +86,7 @@ clean:
 	${MAKE} -C include ${MAKEARGS} clean
 	${MAKE} -C src ${MAKEARGS} clean
 	${MAKE} -C src/tools ${MAKEARGS} clean
-                
+
 distclean: clean
 	${MAKE} -C lang ${MAKEARGS} distclean
 	${MAKE} -C include ${MAKEARGS} distclean

configure.in

@@ -5,7 +5,7 @@ dnl Contact us at dev@anope.org
 
 dnl This program is free but copyrighted software; see the file COPYING for
 dnl details.
- 
+
 dnl Based heavily on the Unreal configure.in script, and extra thanks to
 dnl codemastr from UnrealIRCD.
 
@@ -15,7 +15,7 @@ AC_INIT
 CFLAGS="-g"
 
 # If no bindir, we tell him to run ./Config.
-if test "${with_bindir+set}" != set || test "${with_datadir+set}" != set; then
+if test "${with_instdir+set}" != set; then
   echo "You might want to run ./Config or provide some parameters to this script."
   echo "./configure --help for information about this script"
   exit 0
@@ -68,7 +68,7 @@ AC_CACHE_VAL(ac_cv_valistisarray,
 		     }
 		     int main()
 		     { foo(0, 123); return(0); }]])],[ac_cv_valistisarray=false],[ac_cv_valistisarray=true],[ac_cv_valistisarray=false])])
-					     
+
 if test "$ac_cv_valistisarray" = true ; then
 	AC_DEFINE(HAVE_VA_LIST_AS_ARRAY,[1],[va_list as array])
 	AC_MSG_RESULT(yes)
@@ -109,7 +109,7 @@ AC_ARG_WITH(mysql, [  --without-mysql         Do not use MySQL or attempt to fin
 int main()
 {
 	MYSQL *mysql = mysql_init(0);
-	
+
 	return 0;
 }
 		], ac_cv_mysql_valid=yes, ac_cv_mysql_valid=no)
@@ -130,12 +130,12 @@ int main()
 	short s = 1;
 	short* ptr = &s;
 	unsigned char c = *((char*)ptr);
-	return c;	
+	return c;
 }
 ]
 , AC_DEFINE(BIG_ENDIAN)
   AC_MSG_RESULT(big)
-, AC_DEFINE(LITTLE_ENDIAN) 
+, AC_DEFINE(LITTLE_ENDIAN)
   AC_MSG_RESULT(little)
 )
 
@@ -239,7 +239,7 @@ AC_CHECK_FUNCS(gethostbyname_r,AC_DEFINE(HAVE_GETHOSTBYNAME_R,1))
 AC_CHECK_FUNCS(strlcpy,AC_DEFINE(HAVE_STRLCPY,1))
 AC_CHECK_FUNCS(strlcat,AC_DEFINE(HAVE_STRLCAT,1))
 
-AC_ARG_WITH(rungroup, [ --with-rungroup=group     Specify the rungroup for anope], [ 
+AC_ARG_WITH(rungroup, [ --with-rungroup=group     Specify the rungroup for anope], [
     AC_DEFINE_UNQUOTED(RUNGROUP,"$withval","Run group")
     RUNGROUP=$withval
 ])
@@ -250,31 +250,18 @@ dnl AC_DEFINE_UNQUOTED(MYOSNAME,"`uname -a`","uname")
 
 AC_ARG_WITH(permissions, [ --with-permissions=permissions     Specify the default permissions for anope], AC_DEFINE_UNQUOTED(DEFUMASK,$withval,"Default umask permissions"), AC_DEFINE(DEFUMASK, 007,"Default umask Permissions"))
 
-AC_ARG_WITH(bindir, [ --with-bindir=bindir     Specify the default binary dir for anope], [ 
-    AC_DEFINE_UNQUOTED(SERVICES_BIN,"${withval}/services","Binary Dir")
-    BINDEST=$withval
-    DATDEST=$withval
-    MODULE_PATH=${withval}/modules/
+AC_ARG_WITH(instdir, [ --with-instdir=instdir   Specify the default install dir for anope], [
+    INSTDIR=$withval
 ])
 
 MAKEBIN=`pwd`/run-cc.pl
 
-AC_ARG_WITH(makebin, [--with-makebin=run-cc.pl     Specify the default make binary to use],[MAKEBIN=$withval]) 
+AC_ARG_WITH(makebin, [--with-makebin=run-cc.pl     Specify the default make binary to use],[MAKEBIN=$withval])
 
-AC_SUBST(BINDEST)
+AC_SUBST(INSTDIR)
 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")
- AC_DEFINE_UNQUOTED(MODULE_PATH,"${withval}/modules/","Module dir")
- DATDEST=$withval
- MODULE_PATH=${withval}/modules/
-])
-
-AC_SUBST(DATDEST)
-AC_SUBST(MODULE_PATH)
-
-AC_ARG_WITH(optimization, [ --with-optimisation=1|2|3|4|5   Specify the optimisation level], [
+AC_ARG_WITH(optimization, [ --with-optimization=1|2|3|4|5   Specify the optimization level], [
     CFLAGS="$CFLAGS -O$withval"
 ])
 

include/sysconf.h.in

@@ -75,9 +75,6 @@
 /* va_list as array */
 #undef HAVE_VA_LIST_AS_ARRAY
 
-/* "Module dir" */
-#undef MODULE_PATH
-
 /* "Has mysql/mysql.h" */
 #undef MYSQL_HEADER_PREFIX
 

include/sysconf.h.win32

@@ -28,7 +28,6 @@ typedef unsigned __int8 u_int8_t;
 
 /* Enable Module support */
 #define USE_MODULES
-#define MODULE_PATH ".\\modules\\"
 
 /* Windows/MSVC likes to name things differently */
 #define snprintf		_snprintf

lang/Makefile

@@ -1,9 +1,9 @@
 # Makefile for language module
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
+     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
    	   'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
 
 LANGOBJS = cat de en_us es fr gr hun it nl pl pt ru tr
@@ -18,24 +18,24 @@ all: $(LANGOBJS)
 distclean: clean spotless
 
 install: all
-	test -d $(DATDEST)/languages || mkdir $(DATDEST)/languages
+	test -d $(INSTDIR)/data/languages || mkdir $(INSTDIR)/data/languages
 	@if [ "$(RUNGROUP)" ] ; then \
-		echo chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
-		chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
-		echo chmod -R g+rw $(DATDEST)/languages ; \
-		chmod -R g+rw $(DATDEST)/languages ; \
-		$(CP) $(LANGOBJS) $(DATDEST)/languages ; \
-		echo chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
-		chgrp -R $(RUNGROUP) $(DATDEST)/languages/* ; \
-		echo chmod -R g+rw $(DATDEST)/languages/* ; \
-		chmod -R g+rw $(DATDEST)/languages/* ; \
+		echo chgrp -R $(RUNGROUP) $(INSTDIR)/data/languages ; \
+		chgrp -R $(RUNGROUP) $(INSTDIR)/data/languages ; \
+		echo chmod -R g+rw $(INSTDIR)/data/languages ; \
+		chmod -R g+rw $(INSTDIR)/data/languages ; \
+		$(CP) $(LANGOBJS) $(INSTDIR)/data/languages ; \
+		echo chgrp -R $(RUNGROUP) $(INSTDIR)/data/languages ; \
+		chgrp -R $(RUNGROUP) $(INSTDIR)/data/languages/* ; \
+		echo chmod -R g+rw $(INSTDIR)/data/languages/* ; \
+		chmod -R g+rw $(INSTDIR)/data/languages/* ; \
 	fi
 	@if [ ! "$(RUNGROUP)" ] ; then \
-		chmod 700 $(DATDEST)/languages/ ; \
-		$(CP) $(LANGOBJS) $(DATDEST)/languages ; \
-		chmod 600 $(DATDEST)/languages/* ; \
+		chmod 700 $(INSTDIR)/data/languages/ ; \
+		$(CP) $(LANGOBJS) $(INSTDIR)/data/languages ; \
+		chmod 600 $(INSTDIR)/data/languages/* ; \
 	fi
-	
+
 clean:
 	rm -f $(LANGOBJS) langcomp language.h
 

src/Makefile

@@ -14,10 +14,10 @@ INCLUDES = ../include/commands.h ../include/defs.h  ../include/language.h \
 	../include/modules.h ../include/slist.h ../include/hashcomp.h
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
+   	   'RUNGROUP=${RUNGROUP}' \
 	   'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \
 	   'MAKEBIN=${MAKEBIN}'
 
@@ -112,28 +112,28 @@ spotless:
 	@${MAKE} -C core distclean
 
 install: services
-	test -d ${BINDEST} || mkdir ${BINDEST}
-	$(INSTALL) services $(BINDEST)/services
-	$(INSTALL) bin/anoperc $(BINDEST)/anoperc
+	test -d ${INSTDIR} || mkdir ${INSTDIR}
+	$(INSTALL) services $(INSTDIR)/services
+	$(INSTALL) bin/anoperc $(INSTDIR)/anoperc
 	(cd ../lang ; $(MAKE) install)
-	$(CP) ../data/* $(DATDEST)
-	$(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
-	test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
-	test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
-	@if [ "$(MODULE_PATH)" ] ; then \
-		test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \
-		test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \
+	$(CP) ../data/* $(INSTDIR)/data
+	$(INSTALL) bin/mydbgen $(INSTDIR)/data/mydbgen
+	test -d $(INSTDIR)/data/backups || mkdir $(INSTDIR)/data/backups
+	test -d $(INSTDIR)/data/logs || mkdir $(INSTDIR)/data/logs
+	@if [ "$(INSTDIR)/data/modules" ] ; then \
+		test -d ${INSTDIR}/data/modules || mkdir ${INSTDIR}/data/modules ; \
+		test -d ${INSTDIR}/data/modules/runtime || mkdir ${INSTDIR}/data/modules/runtime ; \
 		(cd modules ; $(MAKE) install) ; \
 		(cd protocol ; ${MAKE} install) ; \
 		(cd core ; ${MAKE} install) ; \
 	fi
 	@if [ "$(RUNGROUP)" ] ; then \
-		echo chgrp -R $(RUNGROUP) $(DATDEST) ; \
-		chgrp -R $(RUNGROUP) $(DATDEST) ; \
-		echo chmod -R g+rw $(DATDEST) ; \
-		chmod -R g+rw $(DATDEST) ; \
-		echo find $(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \
-		find $(DATDEST) -type d -exec chmod g+xs '{}' \; ; \
+		echo chgrp -R $(RUNGROUP) $(INSTDIR)/data ; \
+		chgrp -R $(RUNGROUP) $(INSTDIR)/data ; \
+		echo chmod -R g+rw $(INSTDIR)/data ; \
+		chmod -R g+rw $(INSTDIR)/data ; \
+		echo find $(INSTDIR)/data -type d -exec chmod g+xs \'\{\}\' \\\; ; \
+		find $(INSTDIR)/data -type d -exec chmod g+xs '{}' \; ; \
 	fi
 
 DUMMY:

src/bin/anoperc.cmake

@@ -15,9 +15,9 @@
 
 
 
-ANOPEPID="@DATADIR@/services.pid"
-ANOPROG="@BINDIR@/services"
-LOG="@DATADIR@/logs/"
+ANOPEPID="@INSTDIR@/data/services.pid"
+ANOPROG="@INSTDIR@/services"
+LOG="@INSTDIR@/data/logs/"
 ARCVERSION="1.2"
 
 isAnopeRunning () {
@@ -134,7 +134,7 @@ elif [ "$1" = "help" ] ; then
 		echo "folder or make use of our extensive online support at"
 		echo "http://www.anope.org/"
 	fi
-	
+
 else
 	echo "Anope Remote Control ($ARCVERSION)"
 	echo "Usage: $0 [start|stop|status|restart|rehash|version|help]"

src/bin/anoperc.in

@@ -15,9 +15,9 @@
 
 
 
-ANOPEPID="@DATDEST@/services.pid"
-ANOPROG="@BINDEST@/services"
-LOG="@DATDEST@/logs/"
+ANOPEPID="@INSTDIR@/data/services.pid"
+ANOPROG="@INSTDIR@/services"
+LOG="@INSTDIR@/data/logs/"
 ARCVERSION="1.2"
 
 isAnopeRunning () {
@@ -134,7 +134,7 @@ elif [ "$1" = "help" ] ; then
 		echo "folder or make use of our extensive online support at"
 		echo "http://www.anope.org/"
 	fi
-	
+
 else
 	echo "Anope Remote Control ($ARCVERSION)"
 	echo "Usage: $0 [start|stop|status|restart|rehash|version|help]"

src/core/Makefile

@@ -1,10 +1,10 @@
 include ./Makefile.inc
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
+   	   'RUNGROUP=${RUNGROUP}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' \
 	   'MODULEFLAGS=${MODULEFLAGS}' 'MAKEBIN=${MAKEBIN}'
 
@@ -16,8 +16,8 @@ all: modules subs
 
 modules: $(OBJECTS) $(SO_FILES)
 
-install: 
-	$(CP) ./*.so $(MODULE_PATH) 
+install:
+	$(CP) ./*.so $(INSTDIR)/data/modules
 
 distclean: spotless
 

src/core/Makefile.sub

@@ -1,8 +1,8 @@
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
       	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+   	   'RUNGROUP=${RUNGROUP}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
 
 OBJECTS= $(SRCS:.c=.o)

src/modules/Makefile

@@ -1,10 +1,10 @@
 include ./Makefile.inc
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
+   	   'RUNGROUP=${RUNGROUP}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
 	   'MAKEBIN=${MAKEBIN}'
 
@@ -16,8 +16,8 @@ all: modules subs
 
 modules: $(OBJECTS) $(SO_FILES)
 
-install: 
-	$(CP) ./*.so $(MODULE_PATH) 
+install:
+	$(CP) ./*.so $(INSTDIR)/data/modules
 	@for i in $(SUBS); do \
 	echo "make install in $$i..."; \
 	(cd $$i; $(MAKE) $(MAKEARGS) install);done

src/modules/Makefile.sub

@@ -1,8 +1,8 @@
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
       	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+   	   'RUNGROUP=${RUNGROUP}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
 
 OBJECTS= $(SRCS:.c=.o)

src/protocol/Makefile

@@ -1,10 +1,10 @@
 include ./Makefile.inc
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
+   	   'RUNGROUP=${RUNGROUP}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
 	   'MAKEBIN=${MAKEBIN}'
 
@@ -17,8 +17,8 @@ all: modules subs
 
 modules: $(OBJECTS) $(SO_FILES)
 
-install: 
-	$(CP) ./*.so $(MODULE_PATH) 
+install:
+	$(CP) ./*.so $(INSTDIR)/data/modules
 
 distclean: clean spotless
 

src/protocol/Makefile.sub

@@ -1,8 +1,8 @@
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
       	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+   	   'RUNGROUP=${RUNGROUP}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
 
 OBJECTS= $(SRCS:.c=.o)

src/tools/Makefile

@@ -4,9 +4,9 @@ OBJS =  $(SRCS:.c=.o)
 INCLUDES = ../../include/services.h
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+	   'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
-     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
+     	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
    	   'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
 
 .c.o:
@@ -17,7 +17,7 @@ all: ${OBJS}
 distclean: spotless
 
 anopesmpt:  $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS) 
+	$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
 
 $(OBJS): Makefile
 anopesmtp.o:    anopesmtp.c $(INCLUDES)
@@ -30,10 +30,10 @@ clean:
 spotless: clean
 
 install: anopesmtp db-merger db-convert
-	test -d ${BINDEST} || mkdir ${BINDEST}
-	test -d $(BINDEST)/tools || mkdir $(BINDEST)/tools
-	$(INSTALL) anopesmtp $(BINDEST)/tools/anopesmtp
-	$(INSTALL) db-merger $(BINDEST)/tools/db-merger
-	$(INSTALL) db-convert $(BINDEST)/tools/db-convert
+	test -d ${INSTDIR} || mkdir ${INSTDIR}
+	test -d $(INSTDIR)/tools || mkdir $(INSTDIR)/tools
+	$(INSTALL) anopesmtp $(INSTDIR)/tools/anopesmtp
+	$(INSTALL) db-merger $(INSTDIR)/tools/db-merger
+	$(INSTALL) db-convert $(INSTDIR)/tools/db-convert
 
 DUMMY: