79e650
For the RPMs, we want the custom installation directories to end in
79e650
/pgsql not /postgresql.  This is historical but not worth changing.
79e650
79e650
Notice that this patch also makes the appending of /pgsql unconditional.
79e650
This is to avoid unexpected behavior if the RPM is built in a working
79e650
directory whose path happens to include "postgres" or "pgsql" already.
79e650
However, datadir and sysconfdir are already set up in the specfile's
79e650
configure call, so we do not have to append anything to them.
79e650
79e650
79e650
diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Makefile.global.in
79e650
--- postgresql-9.0.1.orig/src/Makefile.global.in	2010-10-01 10:25:44.000000000 -0400
79e650
+++ postgresql-9.0.1/src/Makefile.global.in	2010-10-11 11:52:05.224975308 -0400
79e650
@@ -55,8 +55,7 @@
79e650
 # Installation directories
79e650
 #
79e650
 # These are set by the equivalent --xxxdir configure options.  We
79e650
-# append "postgresql" to some of them, if the string does not already
79e650
-# contain "pgsql" or "postgres", in order to avoid directory clutter.
79e650
+# append "pgsql" to some of them, in order to avoid directory clutter.
79e650
 #
79e650
 # In a PGXS build, we cannot use the values inserted into Makefile.global
79e650
 # by configure, since the installation tree may have been relocated.
79e650
@@ -74,45 +73,23 @@
79e650
 bindir := @bindir@
79e650
 
79e650
 datadir := @datadir@
79e650
-ifeq "$(findstring pgsql, $(datadir))" ""
79e650
-ifeq "$(findstring postgres, $(datadir))" ""
79e650
-override datadir := $(datadir)/postgresql
79e650
-endif
79e650
-endif
79e650
 
79e650
 sysconfdir := @sysconfdir@
79e650
-ifeq "$(findstring pgsql, $(sysconfdir))" ""
79e650
-ifeq "$(findstring postgres, $(sysconfdir))" ""
79e650
-override sysconfdir := $(sysconfdir)/postgresql
79e650
-endif
79e650
-endif
79e650
 
79e650
 libdir := @libdir@
79e650
 
79e650
 pkglibdir = $(libdir)
79e650
-ifeq "$(findstring pgsql, $(pkglibdir))" ""
79e650
-ifeq "$(findstring postgres, $(pkglibdir))" ""
79e650
-override pkglibdir := $(pkglibdir)/postgresql
79e650
-endif
79e650
-endif
79e650
+override pkglibdir := $(pkglibdir)/pgsql
79e650
 
79e650
 includedir := @includedir@
79e650
 
79e650
 pkgincludedir = $(includedir)
79e650
-ifeq "$(findstring pgsql, $(pkgincludedir))" ""
79e650
-ifeq "$(findstring postgres, $(pkgincludedir))" ""
79e650
-override pkgincludedir := $(pkgincludedir)/postgresql
79e650
-endif
79e650
-endif
79e650
+override pkgincludedir := $(pkgincludedir)/pgsql
79e650
 
79e650
 mandir := @mandir@
79e650
 
79e650
 docdir := @docdir@
79e650
-ifeq "$(findstring pgsql, $(docdir))" ""
79e650
-ifeq "$(findstring postgres, $(docdir))" ""
79e650
-override docdir := $(docdir)/postgresql
79e650
-endif
79e650
-endif
79e650
+override docdir := $(docdir)/pgsql
79e650
 
79e650
 htmldir := @htmldir@
79e650