9405842
diff -Naur postgresql-8.2.0.orig/src/test/regress/GNUmakefile postgresql-8.2.0/src/test/regress/GNUmakefile
9405842
--- postgresql-8.2.0.orig/src/test/regress/GNUmakefile	2006-07-20 20:24:04.000000000 -0400
9405842
+++ postgresql-8.2.0/src/test/regress/GNUmakefile	2006-12-04 19:56:54.000000000 -0500
9405842
@@ -102,12 +102,23 @@
6e96691
 testtablespace := $(abs_builddir)/testtablespace
6e96691
 
6e96691
 
6e96691
+ifdef RPMTESTING
6e96691
+define sed-command
6e96691
+sed -e 's,@abs_srcdir@,$(libdir)/pgsql/test/regress,g' \
6e96691
+    -e 's,@abs_builddir@,$(libdir)/pgsql/test/regress,g' \
6e96691
+    -e 's,@abs_spidir@,$(libdir)/pgsql/test/regress,g' \
6e96691
+    -e 's,@testtablespace@,$(libdir)/pgsql/test/regress/testtablespace,g' \
6e96691
+    -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@
6e96691
+endef
6e96691
+else
6e96691
 define sed-command
6e96691
 sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \
6e96691
     -e 's,@abs_builddir@,$(abs_builddir),g' \
6e96691
+    -e 's,@abs_spidir@,$(abs_builddir)/../../../contrib/spi,g' \
6e96691
     -e 's,@testtablespace@,$(testtablespace),g' \
6e96691
     -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@
6e96691
 endef
6e96691
+endif
6e96691
 
6e96691
 $(input_files): sql/%.sql: input/%.source
6e96691
 	$(sed-command)
9405842
diff -Naur postgresql-8.2.0.orig/src/test/regress/input/create_function_1.source postgresql-8.2.0/src/test/regress/input/create_function_1.source
9405842
--- postgresql-8.2.0.orig/src/test/regress/input/create_function_1.source	2006-02-27 11:09:50.000000000 -0500
9405842
+++ postgresql-8.2.0/src/test/regress/input/create_function_1.source	2006-12-04 19:58:24.000000000 -0500
6e96691
@@ -24,17 +24,17 @@
6e96691
 
6e96691
 CREATE FUNCTION check_primary_key ()
6e96691
 	RETURNS trigger
6e96691
-	AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
6e96691
+	AS '@abs_spidir@/refint@DLSUFFIX@'
9405842
 	LANGUAGE C;
6e96691
 
6e96691
 CREATE FUNCTION check_foreign_key ()
6e96691
 	RETURNS trigger
6e96691
-	AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
6e96691
+	AS '@abs_spidir@/refint@DLSUFFIX@'
9405842
 	LANGUAGE C;
6e96691
 
6e96691
 CREATE FUNCTION autoinc ()
6e96691
 	RETURNS trigger
6e96691
-	AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'
6e96691
+	AS '@abs_spidir@/autoinc@DLSUFFIX@'
9405842
 	LANGUAGE C;
6e96691
 
6e96691
 CREATE FUNCTION funny_dup17 ()
9405842
diff -Naur postgresql-8.2.0.orig/src/test/regress/output/create_function_1.source postgresql-8.2.0/src/test/regress/output/create_function_1.source
9405842
--- postgresql-8.2.0.orig/src/test/regress/output/create_function_1.source	2006-03-14 17:48:25.000000000 -0500
9405842
+++ postgresql-8.2.0/src/test/regress/output/create_function_1.source	2006-12-04 19:58:54.000000000 -0500
6e96691
@@ -25,15 +25,15 @@
6e96691
 NOTICE:  argument type city_budget is only a shell
6e96691
 CREATE FUNCTION check_primary_key ()
6e96691
 	RETURNS trigger
6e96691
-	AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
6e96691
+	AS '@abs_spidir@/refint@DLSUFFIX@'
9405842
 	LANGUAGE C;
6e96691
 CREATE FUNCTION check_foreign_key ()
6e96691
 	RETURNS trigger
6e96691
-	AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
6e96691
+	AS '@abs_spidir@/refint@DLSUFFIX@'
9405842
 	LANGUAGE C;
6e96691
 CREATE FUNCTION autoinc ()
6e96691
 	RETURNS trigger
6e96691
-	AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'
6e96691
+	AS '@abs_spidir@/autoinc@DLSUFFIX@'
9405842
 	LANGUAGE C;
6e96691
 CREATE FUNCTION funny_dup17 ()
6e96691
         RETURNS trigger