ph10 2005/05/04 11:17:29 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/OS Makefile-Base
exim-src/scripts Configure-config.h
Log:
Pass $(MAKE) to the scripts/Configure-config.h script so that it uses
the same command (e.g. "gmake") that was called externally.
Revision Changes Path
1.133 +6 -0 exim/exim-doc/doc-txt/ChangeLog
1.5 +1 -1 exim/exim-src/OS/Makefile-Base
1.2 +7 -1 exim/exim-src/scripts/Configure-config.h
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- ChangeLog 3 May 2005 14:20:00 -0000 1.132
+++ ChangeLog 4 May 2005 10:17:28 -0000 1.133
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.132 2005/05/03 14:20:00 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -280,6 +280,12 @@
timeout_defer, which, if set TRUE, converts the failures into defers for
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
Index: Makefile-Base
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/Makefile-Base,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile-Base 8 Mar 2005 15:32:02 -0000 1.4
+++ Makefile-Base 4 May 2005 10:17:29 -0000 1.5
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/OS/Makefile-Base,v 1.4 2005/03/08 15:32:02 tom Exp $
+# $Cambridge: exim/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 @@
# 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
Index: Configure-config.h
===================================================================
RCS file: /home/cvs/exim/exim-src/scripts/Configure-config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Configure-config.h 6 Oct 2004 15:07:40 -0000 1.1
+++ Configure-config.h 4 May 2005 10:17:29 -0000 1.2
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-src/scripts/Configure-config.h,v 1.1 2004/10/06 15:07:40 ph10 Exp $
+# $Cambridge: exim/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
