From bdaccea9600285febd1fabc3dddb6dbec9947f42 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Thu, 18 Dec 2014 16:01:10 +0000 Subject: Fix some oversights from #895. - Always write the configure cache file as it is needed for updating the makefile when --update is called. - List the modules which have been enabled in the "configuration complete" message. - Silence some harmless warnings about installing PEM files which don't exist. --- make/template/main.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'make/template') diff --git a/make/template/main.mk b/make/template/main.mk index b4d77e4e6..521888bea 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -247,7 +247,7 @@ install: target -$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(MANPATH) 2>/dev/null -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples - -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) + -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules @echo "" @@ -264,11 +264,8 @@ install: target @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf @echo 'Examples are available at:' $(CONPATH)/examples/ -@TARGET BSD_MAKE CONFIGURE_CACHE_FILE = @CONFIGURE_CACHE_FILE@ -@TARGET GNU_MAKE CONFIGURE_CACHE_FILE = $(wildcard @CONFIGURE_CACHE_FILE@) - -GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure $(CONFIGURE_CACHE_FILE) - ./configure -update +GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@ + ./configure --update @TARGET BSD_MAKE .MAKEFILEDEPS: BSDmakefile clean: -- cgit v1.2.3