X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=blobdiff_plain;f=Makefile.in;h=de888c90cf92d1ab8f9f76b4cfb87699be2d417d;hp=d324fb943fe61cce662e3f831088a37fb1fd6810;hb=refs%2Fheads%2Fupstream-ssl;hpb=39423ad1e0a874890f1567531bdcc568b1ec326e

diff --git a/Makefile.in b/Makefile.in
index d324fb9..de888c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,6 +18,7 @@
 
 #### Start of system configuration section. ####
 
+prefix = @prefix@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -27,7 +28,8 @@ AWK = @AWK@
 @SET_MAKE@
 #### End of system configuration section. ####
 
-SUBDIRS = doc ircd
+SUBDIRS = ircd ircd/test
+IRCD_MAKEFILES = Makefile ircd/Makefile ircd/test/Makefile
 
 all: build
 
@@ -35,12 +37,25 @@ all: build
 # Some versions of make give a warning when this is empty:
 .SUFFIXES: .dummy
 
-build:
+build: ${IRCD_MAKEFILES}
 	@for i in ${SUBDIRS}; do \
 		echo "Building $$i..."; \
 		cd $$i; ${MAKE} build; cd ..; \
 	done
 
+config:
+	@echo "*************************************************************"
+	@echo "* The \"make config\" step is now DEPRECATED.  Most           *"
+	@echo "* server options are now configurable via the configuration *"
+	@echo "* file using F-lines; the rest are specified on the command *"
+	@echo "* line to \"./configure\".  To aid the transition, a shell    *"
+	@echo "* script has been provided to generate the necessary        *"
+	@echo "* configuration lines for you.  You may run this script by  *"
+	@echo "* typing \"tools/transition\"; please pay attention to its    *"
+	@echo "* output.  This message will be removed for the next major  *"
+	@echo "* release of ircu.                                          *"
+	@echo "*************************************************************"
+
 root-clean:
 	@for i in '*.orig' '.*.orig' '\#*' '*~' '.*~' '*.bak' '.*.bak' core; do\
 		echo "Removing $$i"; \
@@ -48,7 +63,7 @@ root-clean:
 		test -n "$$REMOVE_FILES" && ${RM} -f $$REMOVE_FILES; \
 	done || true
 
-sub-clean:
+sub-clean: ${IRCD_MAKEFILES}
 	@for i in ${SUBDIRS}; do \
 		echo "Cleaning $$i..."; \
 		cd $$i; ${MAKE} clean; cd ..;\
@@ -63,7 +78,7 @@ root-distclean: root-clean
 		test -n "$$REMOVE_FILES" && ${RM} -f $$REMOVE_FILES; \
 	done || true
 
-sub-distclean:
+sub-distclean: ${IRCD_MAKEFILES}
 	@for i in ${SUBDIRS}; do \
 		echo "Dist-cleaning $$i..."; \
 		cd $$i; ${MAKE} distclean; cd ..;\
@@ -73,25 +88,26 @@ distclean: root-distclean sub-distclean
 	${RM} -f Makefile config.h config.log config.cache config.status \
 		stamp-h
 
-maintainer-clean: root-distclean
+maintainer-clean: root-distclean ${IRCD_MAKEFILES}
 	@for i in ${SUBDIRS}; do \
 		echo "maintainer-cleaning $$i..."; \
 		cd $$i; ${MAKE} maintainer-clean; cd ..;\
 	done
 
-depend:
+depend: ${IRCD_MAKEFILES}
 	@for i in ${SUBDIRS}; do \
 		echo "Making dependencies in $$i..."; \
 		cd $$i; ${MAKE} depend; cd ..; \
 	done
 
-install:
+install: ${IRCD_MAKEFILES}
+	test -d ${prefix} || mkdir ${prefix}
 	@for i in ${SUBDIRS}; do \
 		echo "Installing $$i..."; \
 		cd $$i; ${MAKE} install; cd ..; \
 	done
 
-uninstall:
+uninstall: ${IRCD_MAKEFILES}
 	@for i in ${SUBDIRS}; do \
 		echo "Uninstalling $$i..."; \
 		cd $$i; ${MAKE} uninstall; cd ..; \
@@ -116,10 +132,10 @@ stamp-h: config.h.in config.status
 Makefile: Makefile.in config.status
 	./config.status
 
-doc/Makefile: doc/Makefile.in config.status
+ircd/Makefile: ircd/Makefile.in config.status
 	./config.status
 
-ircd/Makefile: ircd/Makefile.in config.status
+ircd/test/Makefile: ircd/test/Makefile.in config.status
 	./config.status
 
 config.status: configure