postgresql/rpm-pgsql.patch

73 lines
2.3 KiB
Diff
Raw Normal View History

2009-08-18 02:58:55 +00:00
For the RPMs, we want the custom installation directories to end in
/pgsql not /postgresql. This is historical but not worth changing.
2010-03-14 03:48:10 +00:00
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.
2009-08-18 02:58:55 +00:00
2010-03-14 03:48:10 +00:00
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 @@
2005-01-19 05:02:11 +00:00
# Installation directories
#
# These are set by the equivalent --xxxdir configure options. We
-# append "postgresql" to some of them, if the string does not already
2010-03-14 03:48:10 +00:00
-# 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
2010-03-14 03:48:10 +00:00
# by configure, since the installation tree may have been relocated.
@@ -73,45 +72,23 @@
bindir := @bindir@
2005-01-19 05:02:11 +00:00
datadir := @datadir@
2010-03-14 03:48:10 +00:00
-ifeq "$(findstring pgsql, $(datadir))" ""
-ifeq "$(findstring postgres, $(datadir))" ""
2005-01-19 05:02:11 +00:00
-override datadir := $(datadir)/postgresql
2010-03-14 03:48:10 +00:00
-endif
-endif
2005-01-19 05:02:11 +00:00
sysconfdir := @sysconfdir@
2010-03-14 03:48:10 +00:00
-ifeq "$(findstring pgsql, $(sysconfdir))" ""
-ifeq "$(findstring postgres, $(sysconfdir))" ""
2005-01-19 05:02:11 +00:00
-override sysconfdir := $(sysconfdir)/postgresql
2010-03-14 03:48:10 +00:00
-endif
-endif
libdir := @libdir@
2005-01-19 05:02:11 +00:00
pkglibdir = $(libdir)
2010-03-14 03:48:10 +00:00
-ifeq "$(findstring pgsql, $(pkglibdir))" ""
-ifeq "$(findstring postgres, $(pkglibdir))" ""
2005-01-19 05:02:11 +00:00
-override pkglibdir := $(pkglibdir)/postgresql
2010-03-14 03:48:10 +00:00
-endif
-endif
2005-01-19 05:02:11 +00:00
+override pkglibdir := $(pkglibdir)/pgsql
2010-03-14 03:48:10 +00:00
includedir := @includedir@
2005-01-19 05:02:11 +00:00
pkgincludedir = $(includedir)
2010-03-14 03:48:10 +00:00
-ifeq "$(findstring pgsql, $(pkgincludedir))" ""
-ifeq "$(findstring postgres, $(pkgincludedir))" ""
2005-01-19 05:02:11 +00:00
-override pkgincludedir := $(pkgincludedir)/postgresql
2010-03-14 03:48:10 +00:00
-endif
-endif
2005-01-19 05:02:11 +00:00
+override pkgincludedir := $(pkgincludedir)/pgsql
2010-03-14 03:48:10 +00:00
mandir := @mandir@
2009-08-18 02:58:55 +00:00
docdir := @docdir@
2010-03-14 03:48:10 +00:00
-ifeq "$(findstring pgsql, $(docdir))" ""
-ifeq "$(findstring postgres, $(docdir))" ""
2005-01-19 05:02:11 +00:00
-override docdir := $(docdir)/postgresql
2010-03-14 03:48:10 +00:00
-endif
-endif
2005-01-19 05:02:11 +00:00
+override docdir := $(docdir)/pgsql
2010-03-14 03:48:10 +00:00
htmldir := @htmldir@
2009-08-18 02:58:55 +00:00