diff options
author | Bruce Momjian | 2000-10-07 14:55:16 +0000 |
---|---|---|
committer | Bruce Momjian | 2000-10-07 14:55:16 +0000 |
commit | 347b8e91a3f3843ab1bd4fba3099f5ba2f6ae0c9 (patch) | |
tree | 762914bcff815030a00b7de91972d77be463da56 | |
parent | 99b597539f38177e4bf4c5f637996125426497b9 (diff) |
Beos regression patch.
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | src/test/regress/pg_regress.sh | 17 | ||||
-rwxr-xr-x | src/test/regress/regress.sh | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 4f42625a98..6dd874a03a 100644 --- a/configure.in +++ b/configure.in @@ -56,6 +56,7 @@ PGAC_ARG_REQ(with, template, [], case $host_os in aix*) template=aix ;; + beos*) template=beos ;; bsdi*) template=bsdi ;; cygwin*) template=win ;; dgux*) template=dgux ;; diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index f0e06553cc..fcb62f2ae0 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -147,11 +147,11 @@ done # ---------- -# When on Windows or QNX, don't use Unix sockets. +# When on Windows, QNX or BeOS, don't use Unix sockets. # ---------- case $host_platform in - *-*-cygwin* | *-*-qnx*) + *-*-cygwin* | *-*-qnx* | *beos*) unix_sockets=no;; *) unix_sockets=yes;; @@ -169,6 +169,17 @@ 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 @@ -286,7 +297,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 + ${MAKE:-$GMAKE} -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1 if [ $? -ne 0 ] then diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh index 4e85a4cbd6..6557197e67 100755 --- a/src/test/regress/regress.sh +++ b/src/test/regress/regress.sh @@ -11,7 +11,7 @@ shift extratests="$*" case $hostname in - i*86-pc-cygwin* | i386-*-qnx* | beos) + i*86-pc-cygwin* | i386-*-qnx* | *beos*) HOSTLOC="-h localhost" ;; *) |