summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/doc-txt/ChangeLog8
-rw-r--r--src/OS/Makefile-Base4
-rwxr-xr-xsrc/scripts/Configure-config.h10
3 files changed, 17 insertions, 5 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 29b0765e8..dbd12e564 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.132 2005/05/03 14:20:00 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.133 2005/05/04 10:17:28 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -281,6 +281,12 @@ PH/45 In a pipe transport, although a timeout while waiting for the pipe
both kinds of timeout. A transport filter timeout is now identified in
the log output.
+PH/46 The "scripts/Configure-config.h" script calls "make" at one point. On
+ systems where "make" and "gmake" are different, calling "gmake" at top
+ level broke things. I've arranged for the value of $(MAKE) to be passed
+ from the Makefile to this script so that it can call the same version of
+ "make".
+
A note about Exim versions 4.44 and 4.50
----------------------------------------
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