Told Makefile to ignore if cp fails on the binaries.

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

diff --git a/.Makefile.inc b/.Makefile.inc
index 8a2723b5dcb95e6e2152483b8d7e4d2c00044901..1c91237b3f80e7548de340d1a941a430ab7581ce 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -1,50 +1,44 @@
-echo "# Insp Main Makefile" > Makefile
-echo "#" >> Makefile
-echo "# (C) ChatSpike development team" >> Makefile
-echo "#####" >> Makefile
-echo "# MAKEFILE DYNAMICLY GENERATED BY ./configure" >> Makefile
-echo "# DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING!" >> Makefile
-echo "#####" >> Makefile
-echo "# Original Makefile & ./configure by <Craig@ChatSpike.net>" >> Makefile
-echo "# Small modifications by <brain@ChatSpike.net>" >> Makefile
-echo "#" >>Makefile
-echo ""
-echo "CC = g++" >> Makefile
-echo "MAKE = $MAKEPROG" >> Makefile
-echo "PROGS = inspircd" >> Makefile
-echo "FLAGS = $FLAGS" >> Makefile
-echo "LDLIBS = $LDLIBS" >> Makefile
-echo "CONPATH = $CONFIG_DIR" >> Makefile
-echo "MODPATH = $MODULE_DIR" >> Makefile
-echo "BINPATH = $BINARY_DIR" >> Makefile
-echo "MODULES =$MODULES" >> Makefile
-echo "MAKEARGS = 'PROGS=\${PROGS}' 'FLAGS=\${FLAGS}' 'CC=\${CC}' 'LDLIBS=\${LDLIBS}' 'MODULES=\${MODULES}' 'MODPATH=\$(MODPATH)'" >> Makefile
-echo "" >> Makefile
-echo "all : ircd mods config bininst" >> Makefile
-echo "" >> Makefile
-echo "mods:" >> Makefile
-echo " \${MAKE} -C src/modules DIRNAME="src/modules" \$(MAKEARGS)" >> Makefile
-echo "" >> Makefile
-echo "ircd:" >> Makefile
-echo " \${MAKE} -C src DIRNAME="src" \$(MAKEARGS)" >> Makefile
-echo "" >> Makefile
-echo "bininst:" >> Makefile
-echo " @cp src/inspircd \$(BINPATH)" >> Makefile
-echo "" >> Makefile
-echo "config:" >> Makefile
-if [ -n "$COPY_CONF" ] ; then
-echo " @cp conf/inspire.motd \$(CONPATH)/inspire.motd.example" >> Makefile
-echo " @cp conf/inspire.quotes \$(CONPATH)/inspire.quotes.example" >> Makefile
-echo " @cp conf/inspire.rules \$(CONPATH)/inspire.rules.example" >> Makefile
-echo " @cp docs/*.example \$(CONPATH)" >> Makefile
-else
-echo " @echo \"*** Nothing to Be Done for make config\"" >> Makefile
-fi
-echo "clean:" >> Makefile
-echo " rm -rf src/*.o" >> Makefile
-echo " rm -rf src/modules/*.so" >> Makefile
-echo "" >> Makefile
-echo "modclean:" >> Makefile
-echo " rm -rf modules/*.so" >> Makefile
-echo "" >> Makefile
-echo "squeakyclean: modclean clean" >> Makefile
+# Inspircd Main Makefile
+#
+# (C) ChatSpike development team
+# DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING!
+#####
+# Original Makefile & ./configure by <Craig@ChatSpike.net>
+# Small modifications by <brain@ChatSpike.net>
+#
+
+CC = g++
+MAKE = @MAKEPROG@
+PROGS = inspircd
+FLAGS = @FLAGS@
+LDLIBS = @LDLIBS@
+CONPATH = @CONFIG_DIR@
+MODPATH = @MODULE_DIR@
+BINPATH = @BINARY_DIR@
+MODULES = @MODULES@
+MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=$(MODPATH)'
+
+all : ircd mods config bininst
+
+mods:
+       ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
+
+ircd:
+       ${MAKE} -C src DIRNAME="src" $(MAKEARGS)
+
+bininst:
+       @-cp src/inspircd $(BINPATH)
+
+config:
+       @cp conf/inspire.motd $(CONPATH)/inspire.motd.example
+       @cp conf/inspire.quotes $(CONPATH)/inspire.quotes.example
+       @cp conf/inspire.rules $(CONPATH)/inspire.rules.example
+       @cp docs/*.example $(CONPATH)
+clean:
+       rm -rf src/*.o
+       rm -rf src/modules/*.so
+
+modclean:
+       rm -rf modules/*.so
+
+squeakyclean: modclean clean