diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-05-04 10:17:28 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-05-04 10:17:28 +0000 |
| commit | 9176e9f0046f5b7344bc8fadf09104d8bacc5d9d (patch) | |
| tree | 5f08465cf154b8fb01aa19980245407fecb9edf4 /src | |
| parent | 4fa565b2edd4307f03c292dc418b02e191bf231d (diff) | |
Pass $(MAKE) to the scripts/Configure-config.h script so that it uses
the same command (e.g. "gmake") that was called externally.
Diffstat (limited to 'src')
| -rw-r--r-- | src/OS/Makefile-Base | 4 | ||||
| -rwxr-xr-x | src/scripts/Configure-config.h | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index e91015cb2..dff6784a2 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -1,4 +1,4 @@ -# $Cambridge: exim/src/OS/Makefile-Base,v 1.4 2005/03/08 15:32:02 tom Exp $ +# $Cambridge: exim/src/OS/Makefile-Base,v 1.5 2005/05/04 10:17:29 ph10 Exp $ # This file is the basis of the main makefile for Exim and friends. The # makefile at the top level arranges to build the main makefile by calling @@ -81,7 +81,7 @@ os.c: ../src/os.c # Build the config.h file. config.h: Makefile buildconfig ../src/config.h.defaults $(EDITME) - $(SHELL) $(SCRIPTS)/Configure-config.h + $(SHELL) $(SCRIPTS)/Configure-config.h "$(MAKE)" # This target is recognized specially by GNU make. It records those targets diff --git a/src/scripts/Configure-config.h b/src/scripts/Configure-config.h index 2ec437276..e2359b097 100755 --- a/src/scripts/Configure-config.h +++ b/src/scripts/Configure-config.h @@ -1,5 +1,5 @@ #! /bin/sh -# $Cambridge: exim/src/scripts/Configure-config.h,v 1.1 2004/10/06 15:07:40 ph10 Exp $ +# $Cambridge: exim/src/scripts/Configure-config.h,v 1.2 2005/05/04 10:17:29 ph10 Exp $ # Build the config.h file, using the buildconfig program, first ensuring that # it exists. @@ -18,7 +18,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). -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 |