Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8e469b4

Browse files
committed
Beos regression patch.
1 parent 43d402e commit 8e469b4

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

configure.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ PGAC_ARG_REQ(with, template, [],
5656

5757
case $host_os in
5858
aix*) template=aix ;;
59+
beos*) template=beos ;;
5960
bsdi*) template=bsdi ;;
6061
cygwin*) template=win ;;
6162
dgux*) template=dgux ;;

src/test/regress/pg_regress.sh

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.5 2000/10/03 19:37:39 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.6 2000/10/07 14:55:16 momjian Exp $
33

44
me=`basename $0`
55
: ${TMPDIR=/tmp}
@@ -147,11 +147,11 @@ done
147147

148148

149149
# ----------
150-
# When on Windows or QNX, don't use Unix sockets.
150+
# When on Windows, QNX or BeOS, don't use Unix sockets.
151151
# ----------
152152

153153
case $host_platform in
154-
*-*-cygwin* | *-*-qnx*)
154+
*-*-cygwin* | *-*-qnx* | *beos*)
155155
unix_sockets=no;;
156156
*)
157157
unix_sockets=yes;;
@@ -169,6 +169,17 @@ case $host_platform in
169169
DIFFFLAGS=-w;;
170170
esac
171171

172+
# ----------
173+
# Set up the GMAKE variable correctly.
174+
# ----------
175+
176+
case $host_platform in
177+
*beos*)
178+
GMAKE=make;;
179+
*)
180+
GMAKE=gmake;;
181+
esac
182+
172183

173184
# ----------
174185
# Set backend timezone and datestyle explicitly
@@ -286,7 +297,7 @@ then
286297

287298
message "creating temporary installation"
288299
mkdir -p "$LOGDIR" || { (exit 2); exit; }
289-
${MAKE:-gmake} -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1
300+
${MAKE:-$GMAKE} -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1
290301

291302
if [ $? -ne 0 ]
292303
then

src/test/regress/regress.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.54 2000/10/07 14:39:20 momjian Exp $
2+
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.55 2000/10/07 14:55:16 momjian Exp $
33
#
44
if [ $# -eq 0 ]; then
55
echo "Syntax: $0 <hostname> [extra-tests]"
@@ -11,7 +11,7 @@ shift
1111
extratests="$*"
1212

1313
case $hostname in
14-
i*86-pc-cygwin* | i386-*-qnx* | beos)
14+
i*86-pc-cygwin* | i386-*-qnx* | *beos*)
1515
HOSTLOC="-h localhost"
1616
;;
1717
*)

0 commit comments

Comments
 (0)