diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/configure.in b/configure.in index d535a6ff2d..5c986125c0 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.356 2004/05/21 05:07:54 tgl Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.357 2004/05/21 20:56:47 tgl Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -1202,6 +1202,59 @@ CFLAGS="$_CFLAGS" LIBS="$_LIBS" fi +# Adjust installation directories. +# +# These are initially set by the equivalent --xxxdir configure options. +# We append "postgresql" to some of them, if the string does not already +# contain "pgsql" or "postgres", in order to avoid directory clutter. + +if echo "$libexecdir" | egrep 'pgsql|postgres' >/dev/null 2>&1 +then + : +else + libexecdir="$libexecdir/postgresql" +fi + +if echo "$datadir" | egrep 'pgsql|postgres' >/dev/null 2>&1 +then + : +else + datadir="$datadir/postgresql" +fi + +if echo "$sysconfdir" | egrep 'pgsql|postgres' >/dev/null 2>&1 +then + : +else + sysconfdir="$sysconfdir/postgresql" +fi + +pkglibdir="$libdir" +if echo "$pkglibdir" | egrep 'pgsql|postgres' >/dev/null 2>&1 +then + : +else + pkglibdir="$pkglibdir/postgresql" +fi +AC_SUBST(pkglibdir) + +pkgincludedir="$includedir" +if echo "$pkgincludedir" | egrep 'pgsql|postgres' >/dev/null 2>&1 +then + : +else + pkgincludedir="$pkgincludedir/postgresql" +fi +AC_SUBST(pkgincludedir) + +if echo "$docdir" | egrep 'pgsql|postgres' >/dev/null 2>&1 +then + : +else + docdir="$docdir/postgresql" +fi + + # prepare build tree if outside source tree # Note 1: test -ef might not exist, but it's more reliable than `pwd`. # Note 2: /bin/pwd might be better than shell's built-in at getting |