1 diff -uNr postgresql-7.2devel.orig/src/Makefile.global.in postgresql-7.2devel/src/Makefile.global.in
\r
2 --- postgresql-7.2devel.orig/src/Makefile.global.in Sun Sep 16 18:11:09 2001
\r
3 +++ postgresql-7.2devel/src/Makefile.global.in Mon Sep 17 02:08:29 2001
\r
5 pkglibdir = $(libdir)
\r
6 ifeq "$(findstring pgsql, $(pkglibdir))" ""
\r
7 ifeq "$(findstring postgres, $(pkglibdir))" ""
\r
8 -override pkglibdir := $(pkglibdir)/postgresql
\r
9 +override pkglibdir := $(pkglibdir)/pgsql
\r
14 pkgincludedir = $(includedir)
\r
15 ifeq "$(findstring pgsql, $(pkgincludedir))" ""
\r
16 ifeq "$(findstring postgres, $(pkgincludedir))" ""
\r
17 -override pkgincludedir := $(pkgincludedir)/postgresql
\r
18 +override pkgincludedir := $(pkgincludedir)/pgsql
\r
21 includedir_server = $(pkgincludedir)/server
\r
22 diff -uNr postgresql-7.2devel.orig/src/test/regress/GNUmakefile postgresql-7.2devel/src/test/regress/GNUmakefile
\r
23 --- postgresql-7.2devel.orig/src/test/regress/GNUmakefile Sun Sep 16 18:11:11 2001
\r
24 +++ postgresql-7.2devel/src/test/regress/GNUmakefile Mon Sep 17 01:58:31 2001
\r
26 abs_builddir := $(shell pwd)
\r
29 -sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \
\r
30 - -e 's,@abs_builddir@,$(abs_builddir),g' \
\r
31 +sed -e 's,@abs_srcdir@,/usr/lib/pgsql/test/regress,g' \
\r
32 + -e 's,@abs_builddir@,/usr/lib/pgsql/test/regress,g' \
\r
33 -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@
\r
36 diff -uNr postgresql-7.2devel.orig/src/test/regress/input/create_function_1.source postgresql-7.2devel/src/test/regress/input/create_function_1.source
\r
37 --- postgresql-7.2devel.orig/src/test/regress/input/create_function_1.source Wed May 16 18:32:20 2001
\r
38 +++ postgresql-7.2devel/src/test/regress/input/create_function_1.source Mon Sep 17 01:58:31 2001
\r
41 CREATE FUNCTION widget_in(opaque)
\r
43 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
44 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
47 CREATE FUNCTION widget_out(opaque)
\r
49 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
50 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
53 CREATE FUNCTION check_primary_key ()
\r
55 - AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
\r
56 + AS '/usr/lib/pgsql/test/regress/refint.so'
\r
59 CREATE FUNCTION check_foreign_key ()
\r
61 - AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
\r
62 + AS '/usr/lib/pgsql/test/regress/refint.so'
\r
65 CREATE FUNCTION autoinc ()
\r
67 - AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'
\r
68 + AS '/usr/lib/pgsql/test/regress/autoinc.so'
\r
71 CREATE FUNCTION funny_dup17 ()
\r
73 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
74 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
77 CREATE FUNCTION ttdummy ()
\r
79 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
80 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
83 CREATE FUNCTION set_ttdummy (int4)
\r
85 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
86 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
89 diff -uNr postgresql-7.2devel.orig/src/test/regress/output/create_function_1.source postgresql-7.2devel/src/test/regress/output/create_function_1.source
\r
90 --- postgresql-7.2devel.orig/src/test/regress/output/create_function_1.source Fri Aug 10 23:14:34 2001
\r
91 +++ postgresql-7.2devel/src/test/regress/output/create_function_1.source Mon Sep 17 02:01:47 2001
\r
94 CREATE FUNCTION widget_in(opaque)
\r
96 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
97 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
99 NOTICE: ProcedureCreate: type widget is not yet defined
\r
100 CREATE FUNCTION widget_out(opaque)
\r
102 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
103 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
105 CREATE FUNCTION check_primary_key ()
\r
107 - AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
\r
108 + AS '/usr/lib/pgsql/test/regress/refint.so'
\r
110 CREATE FUNCTION check_foreign_key ()
\r
112 - AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
\r
113 + AS '/usr/lib/pgsql/test/regress/refint.so'
\r
115 CREATE FUNCTION autoinc ()
\r
117 - AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'
\r
118 + AS '/usr/lib/pgsql/test/regress/autoinc.so'
\r
120 CREATE FUNCTION funny_dup17 ()
\r
122 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
123 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
125 CREATE FUNCTION ttdummy ()
\r
127 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
128 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
130 CREATE FUNCTION set_ttdummy (int4)
\r
132 - AS '@abs_builddir@/regress@DLSUFFIX@'
\r
133 + AS '/usr/lib/pgsql/test/regress/regress.so'
\r
135 diff -uNr postgresql-7.2devel.orig/src/test/regress/pg_regress.sh postgresql-7.2devel/src/test/regress/pg_regress.sh
\r
136 --- postgresql-7.2devel.orig/src/test/regress/pg_regress.sh Sun Sep 16 18:11:11 2001
\r
137 +++ postgresql-7.2devel/src/test/regress/pg_regress.sh Mon Sep 17 02:02:56 2001
\r
142 -pkglibdir='@pkglibdir@'
\r
143 +pkglibdir='/usr/lib/pgsql'
\r
145 datadir='@datadir@'
\r
146 host_platform='@host_tuple@'
\r