To create a temporary installation, the regression test driver should use

petere · petere · commit 9d2f3000f200 · 2000-10-07T20:23:03.000Z
the make program that was used to build itself.  This seems more correct
than guessing around for some gmake.
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.25 2000/10/02 06:07:25 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.26 2000/10/07 20:23:03 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -36,6 +36,7 @@ pg_regress: pg_regress.sh GNUmakefile
 	    -e 's,@datadir@,$(datadir),g' \
 	    -e 's/@VERSION@/$(VERSION)/g' \
 	    -e 's/@host_tuple@/$(host_tuple)/g' \
+	    -e 's,@GMAKE@,$(MAKE),g' \
 	  $< >$@
 	chmod a+x $@
 
diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.6 2000/10/07 14:55:16 momjian Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.7 2000/10/07 20:23:03 petere Exp $
 
 me=`basename $0`
 : ${TMPDIR=/tmp}
@@ -87,6 +87,8 @@ export PGPORT
 dbname=regression
 hostname=`hostname` || hostname=localhost
 
+: ${GMAKE='@GMAKE@'}
+
 
 # ----------
 # Parse command line options
@@ -169,17 +171,6 @@ case $host_platform in
         DIFFFLAGS=-w;;
 esac
 
-# ----------
-# Set up the GMAKE variable correctly.
-# ----------
-
-case $host_platform in
-    *beos*)
-        GMAKE=make;;
-    *)
-        GMAKE=gmake;;
-esac
-
 
 # ----------
 # Set backend timezone and datestyle explicitly
@@ -297,7 +288,7 @@ then
 
     message "creating temporary installation"
     mkdir -p "$LOGDIR" || { (exit 2); exit; }
-    ${MAKE:-$GMAKE} -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1
+    $GMAKE -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1
 
     if [ $? -ne 0 ]
     then

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.25 2000/10/02 06:07:25 tgl Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.26 2000/10/07 20:23:03 petere Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -36,6 +36,7 @@ pg_regress: pg_regress.sh GNUmakefile`
`36`	`36`	`-e 's,@datadir@,$(datadir),g' \`
`37`	`37`	`-e 's/@VERSION@/$(VERSION)/g' \`
`38`	`38`	`-e 's/@host_tuple@/$(host_tuple)/g' \`
	`39`	`+ -e 's,@GMAKE@,$(MAKE),g' \`
`39`	`40`	`$< >$@`
`40`	`41`	`chmod a+x $@`
`41`	`42`