diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-22 00:34:51 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-22 00:34:51 +0000 |
| commit | 398386943936fbf66291ae3c6ed307779e4b90e4 (patch) | |
| tree | af0523da83c2fe61a30db6de515a6e544051eed3 /src/Makefile.global.in | |
| parent | add8b70dda0439c8b3a89440576cbfc19989ed39 (diff) | |
| download | postgresql-398386943936fbf66291ae3c6ed307779e4b90e4.tar.gz | |
Use wide-character library routines, if available, for upper/lower/initcap
functions. This allows these functions to work correctly with Unicode and
other multibyte encodings. Per prior discussion.
Also, revert my earlier change to move installation path mashing from
Makefile.global to configure. Turns out not to work well because configure
script is working with unexpanded variables, and so fails to match in
cases where it should match.
Diffstat (limited to 'src/Makefile.global.in')
| -rw-r--r-- | src/Makefile.global.in | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index ecbd7d6f0b..7a9183eed3 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.186 2004/05/21 20:56:48 tgl Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.187 2004/05/22 00:34:49 tgl Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -51,22 +51,53 @@ configure_args = @configure_args@ ########################################################################## # # Installation directories +# +# These are 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. prefix := @prefix@ exec_prefix := @exec_prefix@ bindir := @bindir@ sbindir := @sbindir@ + libexecdir := @libexecdir@ +ifeq "$(findstring pgsql, $(libexecdir))" "" +ifeq "$(findstring postgres, $(libexecdir))" "" +override libexecdir := $(libexecdir)/postgresql +endif +endif datadir := @datadir@ +ifeq "$(findstring pgsql, $(datadir))" "" +ifeq "$(findstring postgres, $(datadir))" "" +override datadir := $(datadir)/postgresql +endif +endif + sysconfdir := @sysconfdir@ +ifeq "$(findstring pgsql, $(sysconfdir))" "" +ifeq "$(findstring postgres, $(sysconfdir))" "" +override sysconfdir := $(sysconfdir)/postgresql +endif +endif libdir := @libdir@ -pkglibdir := @pkglibdir@ +pkglibdir = $(libdir) +ifeq "$(findstring pgsql, $(pkglibdir))" "" +ifeq "$(findstring postgres, $(pkglibdir))" "" +override pkglibdir := $(pkglibdir)/postgresql +endif +endif includedir := @includedir@ -pkgincludedir := @pkgincludedir@ +pkgincludedir = $(includedir) +ifeq "$(findstring pgsql, $(pkgincludedir))" "" +ifeq "$(findstring postgres, $(pkgincludedir))" "" +override pkgincludedir := $(pkgincludedir)/postgresql +endif +endif includedir_server = $(pkgincludedir)/server includedir_internal = $(pkgincludedir)/internal @@ -74,6 +105,11 @@ mandir := @mandir@ sqlmansect_dummy = l docdir := @docdir@ +ifeq "$(findstring pgsql, $(docdir))" "" +ifeq "$(findstring postgres, $(docdir))" "" +override docdir := $(docdir)/postgresql +endif +endif localedir := @localedir@ |