From 595091ca4330e079a76cc35fd304e74f2e4273f6 Mon Sep 17 00:00:00 2001 From: frostycoolslug Date: Wed, 7 Apr 2004 19:14:24 +0000 Subject: [PATCH] Fix to Bugs #10 and #11 git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@427 e03df62e-2008-0410-955e-edbf42e46eb7 --- .Makefile.inc | 4 ++++ configure | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/.Makefile.inc b/.Makefile.inc index 83ea71fcf..62d23f0d7 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -31,7 +31,11 @@ echo " \${MAKE} -C src DIRNAME="src" \$(MAKEARGS)" >> Makefile echo " cp src/inspircd \$(BINPATH)" >> Makefile echo "" >> Makefile echo "config:" >> 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 diff --git a/configure b/configure index af9f26950..eccddf5fd 100755 --- a/configure +++ b/configure @@ -364,6 +364,11 @@ touch include/inspircd_config.h echo "Preparing Variables for the Makefile" +if [ "$CONFIG_DIR" != "$ME/conf" ] ; then + COPY_CONF=1 +fi + + case "$OSNAME" in (FreeBSD) LDLIBS="-Ldl" -- 2.39.5