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/Makefile.global.in | |
| 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/Makefile.global.in')
| -rw-r--r-- | src/Makefile.global.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 9a1aa8c5386..9c3b697889b 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.136 2001/08/29 19:14:39 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.137 2001/09/16 16:11:09 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -80,10 +80,20 @@ endif endif libdir := @libdir@ -pkglibdir = $(libdir)/postgresql +pkglibdir = $(libdir) +ifeq "$(findstring pgsql, $(pkglibdir))" "" +ifeq "$(findstring postgres, $(pkglibdir))" "" +override pkglibdir := $(pkglibdir)/postgresql +endif +endif includedir := @includedir@ -pkgincludedir = $(includedir)/postgresql +pkgincludedir = $(includedir) +ifeq "$(findstring pgsql, $(pkgincludedir))" "" +ifeq "$(findstring postgres, $(pkgincludedir))" "" +override pkgincludedir := $(pkgincludedir)/postgresql +endif +endif includedir_server = $(pkgincludedir)/server includedir_internal = $(pkgincludedir)/internal |