Make sure that if an exec() macro fails its picked up before build time

[user/henk/code/inspircd.git] / .Makefile.inc

diff --git a/.Makefile.inc b/.Makefile.inc
index af5a617e994a545c566cf565601141bbdfb8a488..c753bda947ee448505349c2954c542749474bea7 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -9,8 +9,10 @@
 CC = @CC@
 MAKE = @MAKEPROG@
 PROGS = inspircd
-FLAGS = @FLAGS@
-DEBUG = @DEVELOPER@
+NICEFLAGS = @FLAGS@
+FLAGS = $(NICEFLAGS) -pedantic
+NICEDEBUG = @DEVELOPER@
+DEBUG = $(NICEDEBUG) -pedantic
 LDLIBS = @LDLIBS@
 BASE = $(DESTDIR)@BASE_DIR@
 CONPATH = $(DESTDIR)@CONFIG_DIR@
@@ -38,7 +40,7 @@ debug:
        @echo "*      experiencing problems.       *"
        @echo "*                                   *"
        @echo "*************************************"
-       ${MAKE} -C . 'FLAGS=${DEBUG}' all
+       ${MAKE} -C . 'FLAGS=${DEBUG}' 'NICEFLAGS=${NICEDEBUG}' all
 
 mods:
        @echo "Making modules..."
@@ -71,24 +73,8 @@ install: all@EXTRA_DIR@
        @-install -d -m $(INSTMODE) $(BINPATH)
        @-install -d -m $(INSTMODE) $(CONPATH)
        @-install -d -m $(INSTMODE) $(MODPATH)
-@INSTALL_LIST@ -install -m $(INSTMODE) src/inspircd $(BINPATH)
        -install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null
-       @-cp .gdbargs $(BASE)
-       @-cp conf/inspircd.quotes.example $(CONPATH)
-       @-cp conf/inspircd.rules.example $(CONPATH)
-       @-cp conf/inspircd.motd.example $(CONPATH)
-       @-cp conf/inspircd.helpop-full.example $(CONPATH)
-       @-cp conf/inspircd.helpop.example $(CONPATH)
-       @-cp conf/inspircd.censor.example $(CONPATH)
-       @-cp conf/inspircd.filter.example $(CONPATH)
-       @-cp conf/key.pem $(CONPATH)
-       @-cp conf/cert.pem $(CONPATH)
-       @-cp docs/inspircd.conf.example $(CONPATH)
-       ${MAKE} modinstall
-
-modinstall: mods
-       ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) modinst
-       @echo ""
+@INSTALL_LIST@ @echo ""
        @echo "*************************************"
        @echo "*        INSTALL COMPLETE!          *"
        @echo "*                                   *"
@@ -115,6 +101,9 @@ modclean:
        rm -rf lib/*.so
        rm -f bin/inspircd
 
+deinstall:
+@UNINSTALL_LIST@
+
 squeakyclean: distclean
 
 launchd_dir: