Fix error message for router headers_remove expansion failure

[users/heiko/exim.git] / src / scripts / Configure-config.h

diff --git a/src/scripts/Configure-config.h b/src/scripts/Configure-config.h
index 2ec43727668d21b118504211d7ae30af209da515..75d366fca5d7e072d995a3de66522a10715ec458 100755 (executable)
--- a/src/scripts/Configure-config.h
+++ b/src/scripts/Configure-config.h
@@ -1,5 +1,4 @@
 #! /bin/sh
 #! /bin/sh

-# $Cambridge: exim/src/scripts/Configure-config.h,v 1.1 2004/10/06 15:07:40 ph10 Exp $

 
 # Build the config.h file, using the buildconfig program, first ensuring that
 # it exists.
 
 # Build the config.h file, using the buildconfig program, first ensuring that
 # it exists.


@@ -18,7 +17,13 @@
 # space. Oddly, the pattern previously read ^\([A-Z which didn't seem to
 # cause a problem (but did when the new bit was put in).
 
 # space. Oddly, the pattern previously read ^\([A-Z which didn't seem to
 # cause a problem (but did when the new bit was put in).
 

-make buildconfig || exit 1
+# 04-May-2005: if $1 is set, copy it into $MAKE, and then use $MAKE, if set,
+# instead of "make" so that if gmake is used, it is used consistently.
+
+if [ "$1" != "" ] ; then MAKE=$1 ; fi
+if [ "$MAKE" = "" ] ; then MAKE=make ; fi
+
+$MAKE buildconfig || exit 1

 
 # BEWARE: tab characters needed in the following sed command. They have had
 # a nasty tendency to get lost in the past, causing a problem if a tab has
 
 # BEWARE: tab characters needed in the following sed command. They have had
 # a nasty tendency to get lost in the past, causing a problem if a tab has


@@ -29,7 +34,7 @@ make buildconfig || exit 1
 st='    '
 
 (sed -n \
 st='    '
 
 (sed -n \

-  "/\\\$/d;s/#.*\$//;s/^[$st]*\\([A-Z][^:$st]*\\)[$st]*=[$st]*\\([^$st]*\\)[$st]*\$/\\1=\\2 export \\1/p" \
+  "/\\\$/d;s/#.*\$//;s/^[$st]*\\([A-Z][^:!+$st]*\\)[$st]*=[$st]*\\([^$st]*\\)[$st]*\$/\\1=\\2 export \\1/p" \

   < Makefile ; echo "./buildconfig") | /bin/sh
 
 # If buildconfig ends with an error code, it will have output an error
   < Makefile ; echo "./buildconfig") | /bin/sh
 
 # If buildconfig ends with an error code, it will have output an error


@@ -51,4 +56,5 @@ fi
 echo ">>> config.h built"
 echo ""
 
 echo ">>> config.h built"
 echo ""
 

+# vim: set ft=sh :

 # End of Configure-config.h
 # End of Configure-config.h