Commitbc6444d

committed

Fix PL makefiles to support running regression tests in VPATH builds.

1 parent1a022f7 commitbc6444dCopy full SHA for bc6444d

File tree

+66

-3

lines changed

+66

-3

lines changed

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Makefile for PL/Perl`
`2`		`-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.21 2005/05/2408:05:36 neilc Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.22 2005/05/2417:07:41 tgl Exp $`
`3`	`3`
`4`	`4`	`subdir = src/pl/plperl`
`5`	`5`	`top_builddir = ../../..`
`@@ -47,6 +47,27 @@ all: all-lib`
`47`	`47`	`SPI.c: SPI.xs`
`48`	`48`	`$(PERL)$(perl_privlibexp)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@`
`49`	`49`
	`50`	`+# When doing a VPATH build, copy over the .sql and .out files so that the`
	`51`	`+# test script can find them. See comments in src/test/regress/GNUmakefile.`
	`52`	`+ifdefVPATH`
	`53`	`+`
	`54`	`+ifneq ($(PORTNAME),win32)`
	`55`	`+abs_srcdir :=$(shell cd$(srcdir) && pwd)`
	`56`	`+abs_builddir :=$(shell pwd)`
	`57`	`+else`
	`58`	`+abs_srcdir :=$(shell cd$(srcdir) && pwd -W)`
	`59`	`+abs_builddir :=$(shell pwd -W)`
	`60`	`+endif`
	`61`	`+`
	`62`	`+test_files_src :=$(wildcard$(srcdir)/sql/.sql)$(wildcard$(srcdir)/expected/.out)`
	`63`	`+test_files_build :=$(patsubst$(srcdir)/%,$(abs_builddir)/%,$(test_files_src))`
	`64`	`+`
	`65`	`+all:$(test_files_build)`
	`66`	`+$(test_files_build):$(abs_builddir)/%:$(srcdir)/%`
	`67`	`+ln -s$<$@`
	`68`	`+`
	`69`	`+endif`
	`70`	`+`
`50`	`71`	`install: all installdirs`
`51`	`72`	`ifeq ($(enable_shared), yes)`
`52`	`73`	`$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX)`

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.20 2005/05/17 18:26:23 tgl Exp $`
	`1`	`+# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.21 2005/05/24 17:07:41 tgl Exp $`
`2`	`2`
`3`	`3`	`subdir = src/pl/plpython`
`4`	`4`	`top_builddir = ../../..`
`@@ -66,6 +66,27 @@ include $(top_srcdir)/src/Makefile.shlib`
`66`	`66`
`67`	`67`	`all: all-lib`
`68`	`68`
	`69`	`+# When doing a VPATH build, copy over the .sql and .out files so that the`
	`70`	`+# test script can find them. See comments in src/test/regress/GNUmakefile.`
	`71`	`+ifdefVPATH`
	`72`	`+`
	`73`	`+ifneq ($(PORTNAME),win32)`
	`74`	`+abs_srcdir :=$(shell cd$(srcdir) && pwd)`
	`75`	`+abs_builddir :=$(shell pwd)`
	`76`	`+else`
	`77`	`+abs_srcdir :=$(shell cd$(srcdir) && pwd -W)`
	`78`	`+abs_builddir :=$(shell pwd -W)`
	`79`	`+endif`
	`80`	`+`
	`81`	`+test_files_src :=$(wildcard$(srcdir)/sql/.sql)$(wildcard$(srcdir)/expected/.out)`
	`82`	`+test_files_build :=$(patsubst$(srcdir)/%,$(abs_builddir)/%,$(test_files_src))`
	`83`	`+`
	`84`	`+all:$(test_files_build)`
	`85`	`+$(test_files_build):$(abs_builddir)/%:$(srcdir)/%`
	`86`	`+ln -s$<$@`
	`87`	`+`
	`88`	`+endif`
	`89`	`+`
`69`	`90`	`install: all installdirs`
`70`	`91`	`ifeq ($(enable_shared), yes)`
`71`	`92`	`$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX)`

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for the pltcl shared object`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.46 2005/05/17 18:26:23 tgl Exp $`
	`5`	`+# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.47 2005/05/24 17:07:41 tgl Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -50,6 +50,27 @@ ifeq ($(TCL_SHARED_BUILD), 1)`
`50`	`50`	`all: all-lib`
`51`	`51`	`$(MAKE) -C modules$@`
`52`	`52`
	`53`	`+# When doing a VPATH build, copy over the .sql and .out files so that the`
	`54`	`+# test script can find them. See comments in src/test/regress/GNUmakefile.`
	`55`	`+ifdefVPATH`
	`56`	`+`
	`57`	`+ifneq ($(PORTNAME),win32)`
	`58`	`+abs_srcdir :=$(shell cd$(srcdir) && pwd)`
	`59`	`+abs_builddir :=$(shell pwd)`
	`60`	`+else`
	`61`	`+abs_srcdir :=$(shell cd$(srcdir) && pwd -W)`
	`62`	`+abs_builddir :=$(shell pwd -W)`
	`63`	`+endif`
	`64`	`+`
	`65`	`+test_files_src :=$(wildcard$(srcdir)/sql/.sql)$(wildcard$(srcdir)/expected/.out)`
	`66`	`+test_files_build :=$(patsubst$(srcdir)/%,$(abs_builddir)/%,$(test_files_src))`
	`67`	`+`
	`68`	`+all:$(test_files_build)`
	`69`	`+$(test_files_build):$(abs_builddir)/%:$(srcdir)/%`
	`70`	`+ln -s$<$@`
	`71`	`+`
	`72`	`+endif`
	`73`	`+`
`53`	`74`	`install: all installdirs`
`54`	`75`	`ifeq ($(enable_shared), yes)`
`55`	`76`	`$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)`

Comments

(0)