Index: src/test/regress/GNUmakefile
===================================================================
RCS file: /projects/cvsroot/pgsql/src/test/regress/GNUmakefile,v
retrieving revision 1.73
diff -c -r1.73 GNUmakefile
*** src/test/regress/GNUmakefile	7 Apr 2008 14:15:58 -0000	1.73
--- src/test/regress/GNUmakefile	29 May 2008 12:17:18 -0000
***************
*** 122,127 ****
--- 122,129 ----
  .PHONY: all-spi
  all-spi:
  	$(MAKE) -C $(contribdir)/spi refint$(DLSUFFIX) autoinc$(DLSUFFIX)
+ 	cp $(contribdir)/spi/refint$(DLSUFFIX) .
+ 	cp $(contribdir)/spi/autoinc$(DLSUFFIX) .
  
  # Tablespace setup
  .PHONY: tablespace-setup
Index: src/test/regress/input/create_function_1.source
===================================================================
RCS file: /projects/cvsroot/pgsql/src/test/regress/input/create_function_1.source,v
retrieving revision 1.17
diff -c -r1.17 create_function_1.source
*** src/test/regress/input/create_function_1.source	27 Feb 2006 16:09:50 -0000	1.17
--- src/test/regress/input/create_function_1.source	29 May 2008 12:17:18 -0000
***************
*** 24,40 ****
  
  CREATE FUNCTION check_primary_key ()
  	RETURNS trigger
! 	AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
  	LANGUAGE C;
  
  CREATE FUNCTION check_foreign_key ()
  	RETURNS trigger
! 	AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
  	LANGUAGE C;
  
  CREATE FUNCTION autoinc ()
  	RETURNS trigger
! 	AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'
  	LANGUAGE C;
  
  CREATE FUNCTION funny_dup17 ()
--- 24,40 ----
  
  CREATE FUNCTION check_primary_key ()
  	RETURNS trigger
! 	AS '@abs_builddir@/refint@DLSUFFIX@'
  	LANGUAGE C;
  
  CREATE FUNCTION check_foreign_key ()
  	RETURNS trigger
! 	AS '@abs_builddir@/refint@DLSUFFIX@'
  	LANGUAGE C;
  
  CREATE FUNCTION autoinc ()
  	RETURNS trigger
! 	AS '@abs_builddir@/autoinc@DLSUFFIX@'
  	LANGUAGE C;
  
  CREATE FUNCTION funny_dup17 ()
Index: src/test/regress/output/create_function_1.source
===================================================================
RCS file: /projects/cvsroot/pgsql/src/test/regress/output/create_function_1.source,v
retrieving revision 1.30
diff -c -r1.30 create_function_1.source
*** src/test/regress/output/create_function_1.source	18 Jun 2007 21:40:58 -0000	1.30
--- src/test/regress/output/create_function_1.source	29 May 2008 12:17:18 -0000
***************
*** 25,39 ****
  NOTICE:  argument type city_budget is only a shell
  CREATE FUNCTION check_primary_key ()
  	RETURNS trigger
! 	AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
  	LANGUAGE C;
  CREATE FUNCTION check_foreign_key ()
  	RETURNS trigger
! 	AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'
  	LANGUAGE C;
  CREATE FUNCTION autoinc ()
  	RETURNS trigger
! 	AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'
  	LANGUAGE C;
  CREATE FUNCTION funny_dup17 ()
          RETURNS trigger
--- 25,39 ----
  NOTICE:  argument type city_budget is only a shell
  CREATE FUNCTION check_primary_key ()
  	RETURNS trigger
! 	AS '@abs_builddir@/refint@DLSUFFIX@'
  	LANGUAGE C;
  CREATE FUNCTION check_foreign_key ()
  	RETURNS trigger
! 	AS '@abs_builddir@/refint@DLSUFFIX@'
  	LANGUAGE C;
  CREATE FUNCTION autoinc ()
  	RETURNS trigger
! 	AS '@abs_builddir@/autoinc@DLSUFFIX@'
  	LANGUAGE C;
  CREATE FUNCTION funny_dup17 ()
          RETURNS trigger