summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.Makefile.inc2
-rwxr-xr-xconfigure5
2 files changed, 4 insertions, 3 deletions
diff --git a/.Makefile.inc b/.Makefile.inc
index 8a2723b5d..816a7e38b 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -32,7 +32,7 @@ echo "bininst:" >> Makefile
echo " @cp src/inspircd \$(BINPATH)" >> Makefile
echo "" >> Makefile
echo "config:" >> Makefile
-if [ -n "$COPY_CONF" ] ; then
+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
diff --git a/configure b/configure
index 393943ef6..cc603917b 100755
--- a/configure
+++ b/configure
@@ -103,8 +103,8 @@ exists () { # because some shells don't have test -e
echo "#include <string.h>">.test.cpp
echo "#include <stdio.h>">>.test.cpp
echo "int main() { char a[10]; char b[10]; strlcpy(a,b,10); printf(\"%d\\n\",999); }" >>.test.cpp
-g++ -o .test .test.cpp
-HAS_STRLCPY=`./.test`
+g++ -o .test .test.cpp 2>&1
+HAS_STRLCPY=`./.test 2>&1`
rm -f .test.cpp .test
clear
@@ -408,6 +408,7 @@ echo -e "\033[0;37m"
echo "Writing cache file for future ./configures ..."
+COPY_CONF=0
if [ "$CONFIG_DIR" != "$ME/conf" ] ; then
COPY_CONF=1
fi