diff options
Diffstat (limited to 'rpm-pgsql.patch')
| -rw-r--r-- | rpm-pgsql.patch | 76 |
1 files changed, 44 insertions, 32 deletions
diff --git a/rpm-pgsql.patch b/rpm-pgsql.patch index e595db7..b7d5343 100644 --- a/rpm-pgsql.patch +++ b/rpm-pgsql.patch @@ -1,60 +1,72 @@ For the RPMs, we want the custom installation directories to end in /pgsql not /postgresql. This is historical but not worth changing. +Notice that this patch also makes the appending of /pgsql unconditional. +This is to avoid unexpected behavior if the RPM is built in a working +directory whose path happens to include "postgres" or "pgsql" already. +However, datadir and sysconfdir are already set up in the specfile's +configure call, so we do not have to append anything to them. -diff -Naur postgresql-8.4.0.orig/src/Makefile.global.in postgresql-8.4.0/src/Makefile.global.in ---- postgresql-8.4.0.orig/src/Makefile.global.in 2009-06-22 23:46:00.000000000 -0400 -+++ postgresql-8.4.0/src/Makefile.global.in 2009-08-12 23:14:53.000000000 -0400 -@@ -54,7 +54,7 @@ + +diff -Naur postgresql-8.4.3.orig/src/Makefile.global.in postgresql-8.4.3/src/Makefile.global.in +--- postgresql-8.4.3.orig/src/Makefile.global.in 2009-06-22 23:46:00.000000000 -0400 ++++ postgresql-8.4.3/src/Makefile.global.in 2010-03-13 22:18:12.000000000 -0500 +@@ -54,8 +54,7 @@ # Installation directories # # These are set by the equivalent --xxxdir configure options. We -# append "postgresql" to some of them, if the string does not already -+# append "pgsql" to some of them, if the string does not already - # contain "pgsql" or "postgres", in order to avoid directory clutter. +-# contain "pgsql" or "postgres", in order to avoid directory clutter. ++# append "pgsql" to some of them, in order to avoid directory clutter. # # In a PGXS build, we cannot use the values inserted into Makefile.global -@@ -75,14 +75,14 @@ + # by configure, since the installation tree may have been relocated. +@@ -73,45 +72,23 @@ + bindir := @bindir@ + datadir := @datadir@ - ifeq "$(findstring pgsql, $(datadir))" "" - ifeq "$(findstring postgres, $(datadir))" "" +-ifeq "$(findstring pgsql, $(datadir))" "" +-ifeq "$(findstring postgres, $(datadir))" "" -override datadir := $(datadir)/postgresql -+override datadir := $(datadir)/pgsql - endif - endif +-endif +-endif sysconfdir := @sysconfdir@ - ifeq "$(findstring pgsql, $(sysconfdir))" "" - ifeq "$(findstring postgres, $(sysconfdir))" "" +-ifeq "$(findstring pgsql, $(sysconfdir))" "" +-ifeq "$(findstring postgres, $(sysconfdir))" "" -override sysconfdir := $(sysconfdir)/postgresql -+override sysconfdir := $(sysconfdir)/pgsql - endif - endif +-endif +-endif + + libdir := @libdir@ -@@ -91,7 +91,7 @@ pkglibdir = $(libdir) - ifeq "$(findstring pgsql, $(pkglibdir))" "" - ifeq "$(findstring postgres, $(pkglibdir))" "" +-ifeq "$(findstring pgsql, $(pkglibdir))" "" +-ifeq "$(findstring postgres, $(pkglibdir))" "" -override pkglibdir := $(pkglibdir)/postgresql +-endif +-endif +override pkglibdir := $(pkglibdir)/pgsql - endif - endif -@@ -100,7 +100,7 @@ + includedir := @includedir@ + pkgincludedir = $(includedir) - ifeq "$(findstring pgsql, $(pkgincludedir))" "" - ifeq "$(findstring postgres, $(pkgincludedir))" "" +-ifeq "$(findstring pgsql, $(pkgincludedir))" "" +-ifeq "$(findstring postgres, $(pkgincludedir))" "" -override pkgincludedir := $(pkgincludedir)/postgresql +-endif +-endif +override pkgincludedir := $(pkgincludedir)/pgsql - endif - endif -@@ -109,7 +109,7 @@ + mandir := @mandir@ + docdir := @docdir@ - ifeq "$(findstring pgsql, $(docdir))" "" - ifeq "$(findstring postgres, $(docdir))" "" +-ifeq "$(findstring pgsql, $(docdir))" "" +-ifeq "$(findstring postgres, $(docdir))" "" -override docdir := $(docdir)/postgresql +-endif +-endif +override docdir := $(docdir)/pgsql - endif - endif + + htmldir := @htmldir@ |