X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=01b82d26285a44c07a241a1aa1c85cb6d93f66a2;hb=85ce325779c67004975f67475d3cebc05d66e197;hp=6899d35d89ce5c141dc6c27d361fd6a62b8223d9;hpb=fb947d5615d96922efac7ecda941caab77dceb0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index 6899d35d8..01b82d262 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -10,6 +10,7 @@ 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
@@ -17,20 +18,23 @@ 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}'" >> Makefile
+echo "MAKEARGS = 'PROGS=\${PROGS}' 'FLAGS=\${FLAGS}' 'CC=\${CC}' 'LDLIBS=\${LDLIBS}' 'MODULES=\${MODULES}' 'MODPATH=\$(MODPATH)'" >> Makefile
 echo "" >> Makefile
 echo "all : ircd mods config" >> Makefile
 echo "" >> Makefile
 echo "mods:" >> Makefile
-echo "	make -C src/modules DIRNAME="src/modules" \$(MAKEARGS)" >> Makefile
-echo "	mv src/modules/*.so \$(MODPATH)" >> 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 "	cp src/inspircd \$(BINPATH)" >> Makefile
+echo "	\${MAKE} -C src DIRNAME="src" \$(MAKEARGS)" >> Makefile
+echo "	@cp src/inspircd \$(BINPATH)" >> Makefile
 echo "" >> Makefile
 echo "config:" >> Makefile
-echo "	cp conf/* \$(CONPATH)" >> Makefile
+if [ -n "$COPY_CONF" ] ; then
+echo "	@cp conf/* \$(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/*.o" >> Makefile