echo "#" >>Makefile
echo ""
echo "CC = g++" >> Makefile
+echo "MAKE = $MAKEPROG" >> Makefile
echo "PROGS = inspircd" >> Makefile
echo "FLAGS = $FLAGS" >> Makefile
echo "LDLIBS = $LDLIBS" >> 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 "all : ircd mods config bininst" >> 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 "" >> Makefile
+echo "bininst:" >> Makefile
+echo " @cp src/inspircd \$(BINPATH)" >> Makefile
echo "" >> Makefile
echo "config:" >> Makefile
-echo " cp conf/* \$(CONPATH)" >> Makefile
+if [ "$COPY_CONF" -eq "1" ] ; 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/*.o" >> Makefile
+echo " rm -rf src/modules/*.so" >> Makefile
echo "" >> Makefile
echo "modclean:" >> Makefile
echo " rm -rf modules/*.so" >> Makefile