Tweak temporary-installation setup so that it doesn't break when the
configured install --prefix begins with /data/...
This commit is contained in:
parent
144ec3c148
commit
25d88e4c53
@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.15 2000/12/31 18:38:44 tgl Exp $
|
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.16 2001/01/02 02:13:48 tgl Exp $
|
||||||
|
|
||||||
me=`basename $0`
|
me=`basename $0`
|
||||||
: ${TMPDIR=/tmp}
|
: ${TMPDIR=/tmp}
|
||||||
@ -269,10 +269,11 @@ then
|
|||||||
temp_install="`pwd`/$temp_install"
|
temp_install="`pwd`/$temp_install"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
bindir=$temp_install/$bindir
|
bindir=$temp_install/install/$bindir
|
||||||
libdir=$temp_install/$libdir
|
libdir=$temp_install/install/$libdir
|
||||||
datadir=$temp_install/$datadir
|
datadir=$temp_install/install/$datadir
|
||||||
PGDATA=$temp_install/data
|
PGDATA=$temp_install/data
|
||||||
|
|
||||||
if [ "$unix_sockets" = no ]; then
|
if [ "$unix_sockets" = no ]; then
|
||||||
PGHOST=$hostname
|
PGHOST=$hostname
|
||||||
export PGHOST
|
export PGHOST
|
||||||
@ -305,7 +306,7 @@ then
|
|||||||
if [ ! -d "$LOGDIR" ]; then
|
if [ ! -d "$LOGDIR" ]; then
|
||||||
mkdir -p "$LOGDIR" || { (exit 2); exit; }
|
mkdir -p "$LOGDIR" || { (exit 2); exit; }
|
||||||
fi
|
fi
|
||||||
$GMAKE -C "$top_builddir" DESTDIR="$temp_install" install with_perl=no with_python=no >"$LOGDIR/install.log" 2>&1
|
$GMAKE -C "$top_builddir" DESTDIR="$temp_install/install" install with_perl=no with_python=no >"$LOGDIR/install.log" 2>&1
|
||||||
|
|
||||||
if [ $? -ne 0 ]
|
if [ $? -ne 0 ]
|
||||||
then
|
then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user