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 @@ # 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. # # In a PGXS build, we cannot use the values inserted into Makefile.global @@ -73,14 +73,14 @@ datadir := @datadir@ ifeq "$(findstring pgsql, $(datadir))" "" ifeq "$(findstring postgres, $(datadir))" "" -override datadir := $(datadir)/postgresql +override datadir := $(datadir)/pgsql endif endif sysconfdir := @sysconfdir@ ifeq "$(findstring pgsql, $(sysconfdir))" "" ifeq "$(findstring postgres, $(sysconfdir))" "" -override sysconfdir := $(sysconfdir)/postgresql +override sysconfdir := $(sysconfdir)/pgsql endif endif @@ -89,7 +89,7 @@ pkglibdir = $(libdir) ifeq "$(findstring pgsql, $(pkglibdir))" "" ifeq "$(findstring postgres, $(pkglibdir))" "" -override pkglibdir := $(pkglibdir)/postgresql +override pkglibdir := $(pkglibdir)/pgsql endif endif @@ -98,7 +98,7 @@ pkgincludedir = $(includedir) ifeq "$(findstring pgsql, $(pkgincludedir))" "" ifeq "$(findstring postgres, $(pkgincludedir))" "" -override pkgincludedir := $(pkgincludedir)/postgresql +override pkgincludedir := $(pkgincludedir)/pgsql endif endif @@ -109,7 +109,7 @@ ifneq (,$(docdir)) ifeq "$(findstring pgsql, $(docdir))" "" ifeq "$(findstring postgres, $(docdir))" "" -override docdir := $(docdir)/postgresql +override docdir := $(docdir)/pgsql endif endif endif