diff options
| author | Peter Eisentraut | 2001-09-16 16:11:11 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2001-09-16 16:11:11 +0000 |
| commit | 264f8f2b6c8fe64110753c25634e0f1178cbe243 (patch) | |
| tree | 570f4c70d6494a8ca543c915e59bfa9de1761e84 /src/test | |
| parent | d20a50de33d86dfbf8d6097d460ebd3a14bd52c9 (diff) | |
Install dynamically loadable modules into a private subdirectory
under libdir, for a cleaner separation in the installation layout
and compatibility with binary packaging standards. Point backend's
default search location there. The contrib modules are also
installed in the said location, giving them the benefit of the
default search path as well. No changes in user interface
nevertheless.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.sh | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 595c74f5e2..84d2959e4f 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.34 2001/04/04 21:15:56 tgl Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.35 2001/09/16 16:11:11 petere Exp $ # #------------------------------------------------------------------------- @@ -34,6 +34,7 @@ all: pg_regress pg_regress: pg_regress.sh GNUmakefile sed -e 's,@bindir@,$(bindir),g' \ -e 's,@libdir@,$(libdir),g' \ + -e 's,@pkglibdir@,$(pkglibdir),g' \ -e 's,@datadir@,$(datadir),g' \ -e 's/@VERSION@/$(VERSION)/g' \ -e 's/@host_tuple@/$(host_tuple)/g' \ diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index 552724a10f..c325035899 100644 --- 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.21 2001/05/27 09:59:30 petere Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.22 2001/09/16 16:11:11 petere Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -70,6 +70,7 @@ fi : ${outputdir=.} libdir='@libdir@' +pkglibdir='@pkglibdir@' bindir='@bindir@' datadir='@datadir@' host_platform='@host_tuple@' @@ -271,6 +272,7 @@ then bindir=$temp_install/install/$bindir libdir=$temp_install/install/$libdir + pkglibdir=$temp_install/install/$pkglibdir datadir=$temp_install/install/$datadir PGDATA=$temp_install/data @@ -450,7 +452,7 @@ fi if [ "$enable_shared" = yes ]; then message "installing PL/pgSQL" - "$bindir/createlang" -L "$libdir" $psql_options plpgsql $dbname + "$bindir/createlang" -L "$pkglibdir" $psql_options plpgsql $dbname if [ $? -ne 0 ] && [ $? -ne 2 ]; then echo "$me: createlang failed" (exit 2); exit |