|
 |
80b1cae |
diff -Naur postgresql-8.1.0.orig/src/Makefile.global.in postgresql-8.1.0/src/Makefile.global.in
|
|
|
80b1cae |
--- postgresql-8.1.0.orig/src/Makefile.global.in 2005-09-27 13:39:32.000000000 -0400
|
|
|
80b1cae |
+++ postgresql-8.1.0/src/Makefile.global.in 2005-11-07 14:58:59.000000000 -0500
|
|
|
6e96691 |
@@ -53,7 +53,7 @@
|
|
|
6e96691 |
# Installation directories
|
|
|
6e96691 |
#
|
|
|
6e96691 |
# These are set by the equivalent --xxxdir configure options. We
|
|
|
6e96691 |
-# append "postgresql" to some of them, if the string does not already
|
|
|
6e96691 |
+# append "pgsql" to some of them, if the string does not already
|
|
|
6e96691 |
# contain "pgsql" or "postgres", in order to avoid directory clutter.
|
|
|
80b1cae |
#
|
|
|
80b1cae |
# In a PGXS build, we cannot use the values inserted into Makefile.global
|
|
|
80b1cae |
@@ -73,14 +73,14 @@
|
|
|
6e96691 |
datadir := @datadir@
|
|
|
6e96691 |
ifeq "$(findstring pgsql, $(datadir))" ""
|
|
|
6e96691 |
ifeq "$(findstring postgres, $(datadir))" ""
|
|
|
6e96691 |
-override datadir := $(datadir)/postgresql
|
|
|
6e96691 |
+override datadir := $(datadir)/pgsql
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
|
|
|
6e96691 |
sysconfdir := @sysconfdir@
|
|
|
6e96691 |
ifeq "$(findstring pgsql, $(sysconfdir))" ""
|
|
|
6e96691 |
ifeq "$(findstring postgres, $(sysconfdir))" ""
|
|
|
6e96691 |
-override sysconfdir := $(sysconfdir)/postgresql
|
|
|
6e96691 |
+override sysconfdir := $(sysconfdir)/pgsql
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
|
|
|
80b1cae |
@@ -89,7 +89,7 @@
|
|
|
6e96691 |
pkglibdir = $(libdir)
|
|
|
6e96691 |
ifeq "$(findstring pgsql, $(pkglibdir))" ""
|
|
|
6e96691 |
ifeq "$(findstring postgres, $(pkglibdir))" ""
|
|
|
6e96691 |
-override pkglibdir := $(pkglibdir)/postgresql
|
|
|
6e96691 |
+override pkglibdir := $(pkglibdir)/pgsql
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
|
|
|
80b1cae |
@@ -98,7 +98,7 @@
|
|
|
6e96691 |
pkgincludedir = $(includedir)
|
|
|
6e96691 |
ifeq "$(findstring pgsql, $(pkgincludedir))" ""
|
|
|
6e96691 |
ifeq "$(findstring postgres, $(pkgincludedir))" ""
|
|
|
6e96691 |
-override pkgincludedir := $(pkgincludedir)/postgresql
|
|
|
6e96691 |
+override pkgincludedir := $(pkgincludedir)/pgsql
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
endif
|
|
|
80b1cae |
|
|
|
6e96691 |
@@ -109,7 +109,7 @@
|
|
|
6e96691 |
ifneq (,$(docdir))
|
|
|
6e96691 |
ifeq "$(findstring pgsql, $(docdir))" ""
|
|
|
6e96691 |
ifeq "$(findstring postgres, $(docdir))" ""
|
|
|
6e96691 |
-override docdir := $(docdir)/postgresql
|
|
|
6e96691 |
+override docdir := $(docdir)/pgsql
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
endif
|
|
|
6e96691 |
endif
|