diff options
| author | Tom Lane <tgl@fedoraproject.org> | 2009-08-18 02:58:55 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@fedoraproject.org> | 2009-08-18 02:58:55 +0000 |
| commit | 084ca74c6414a272863de0ae756ee704386ae380 (patch) | |
| tree | ae869622d27f275fe78f7992cda44c6f0879944e /rpm-pgsql.patch | |
| parent | cddd7916a21eb15881c02a88fa35b84853e75ccb (diff) | |
Update to PostgreSQL 8.4.0.postgresql-8_4_0-1_fc12
Diffstat (limited to 'rpm-pgsql.patch')
| -rw-r--r-- | rpm-pgsql.patch | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/rpm-pgsql.patch b/rpm-pgsql.patch index ee77427..e595db7 100644 --- a/rpm-pgsql.patch +++ b/rpm-pgsql.patch @@ -1,7 +1,11 @@ -diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Makefile.global.in ---- postgresql-8.1.0.orig/src/Makefile.global.in 2005-09-27 13:39:32.000000000 -0400 -+++ postgresql-8.1.0/src/Makefile.global.in 2005-11-07 14:58:59.000000000 -0500 -@@ -53,7 +53,7 @@ +For the RPMs, we want the custom installation directories to end in +/pgsql not /postgresql. This is historical but not worth changing. + + +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 @@ # Installation directories # # These are set by the equivalent --xxxdir configure options. We @@ -10,7 +14,7 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Mak # contain "pgsql" or "postgres", in order to avoid directory clutter. # # In a PGXS build, we cannot use the values inserted into Makefile.global -@@ -73,14 +73,14 @@ +@@ -75,14 +75,14 @@ datadir := @datadir@ ifeq "$(findstring pgsql, $(datadir))" "" ifeq "$(findstring postgres, $(datadir))" "" @@ -27,7 +31,7 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Mak endif endif -@@ -89,7 +89,7 @@ +@@ -91,7 +91,7 @@ pkglibdir = $(libdir) ifeq "$(findstring pgsql, $(pkglibdir))" "" ifeq "$(findstring postgres, $(pkglibdir))" "" @@ -36,7 +40,7 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Mak endif endif -@@ -98,7 +98,7 @@ +@@ -100,7 +100,7 @@ pkgincludedir = $(includedir) ifeq "$(findstring pgsql, $(pkgincludedir))" "" ifeq "$(findstring postgres, $(pkgincludedir))" "" @@ -46,11 +50,11 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Mak endif @@ -109,7 +109,7 @@ - ifneq (,$(docdir)) + docdir := @docdir@ ifeq "$(findstring pgsql, $(docdir))" "" ifeq "$(findstring postgres, $(docdir))" "" -override docdir := $(docdir)/postgresql +override docdir := $(docdir)/pgsql endif endif - endif + |