Put path configuration information into a .h file instead of cluttering

several different module Makefiles with it.  Also, do any adjustment
of installation paths during configure, rather than every time Makefile.global
is read.

1 files changed, 55 insertions, 0 deletions

diff --git a/configure b/configure
index 2c26f110b2..12c5147dae 100755
--- a/configure
+++ b/configure
@@ -17939,6 +17939,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
+
+
+pkgincludedir="$includedir"
+if echo "$pkgincludedir" | egrep 'pgsql|postgres' >/dev/null 2>&1
+then
+  :
+else
+  pkgincludedir="$pkgincludedir/postgresql"
+fi
+
+
+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
@@ -18639,6 +18692,8 @@ s,@have_docbook@,$have_docbook,;t t
 s,@DOCBOOKSTYLE@,$DOCBOOKSTYLE,;t t
 s,@COLLATEINDEX@,$COLLATEINDEX,;t t
 s,@SGMLSPL@,$SGMLSPL,;t t
+s,@pkglibdir@,$pkglibdir,;t t
+s,@pkgincludedir@,$pkgincludedir,;t t
 s,@vpath_build@,$vpath_build,;t t
 CEOF