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

10 files changed, 56 insertions, 56 deletions

diff --git a/src/Makefile b/src/Makefile
index bde534274..e6d32c5f2 100644
--- a/src/Makefile
+++ b/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:
diff --git a/src/bin/anoperc.cmake b/src/bin/anoperc.cmake
index 02c5bf18e..3e7cbec62 100644
--- a/src/bin/anoperc.cmake
+++ b/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]"
diff --git a/src/bin/anoperc.in b/src/bin/anoperc.in
index 4f4961c9c..3e7cbec62 100644
--- a/src/bin/anoperc.in
+++ b/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]"
diff --git a/src/core/Makefile b/src/core/Makefile
index 1fba36e5e..f4df49581 100644
--- a/src/core/Makefile
+++ b/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
 
diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub
index 9fbadf3b0..7b1099b37 100644
--- a/src/core/Makefile.sub
+++ b/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)
diff --git a/src/modules/Makefile b/src/modules/Makefile
index dce685230..c964439a8 100644
--- a/src/modules/Makefile
+++ b/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
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
index 7697249bf..d9011d602 100644
--- a/src/modules/Makefile.sub
+++ b/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)
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index b1db60771..1a064000c 100644
--- a/src/protocol/Makefile
+++ b/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
 
diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
index 9fd25dc0c..12502d87e 100644
--- a/src/protocol/Makefile.sub
+++ b/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)
diff --git a/src/tools/Makefile b/src/tools/Makefile
index a73df423e..9de555f55 100644
--- a/src/tools/Makefile
+++ b/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: