Fix PL makefiles to support running regression tests in VPATH builds.
This commit is contained in:
parent
1a022f71d8
commit
bc6444dc6a
@ -1,5 +1,5 @@
|
|||||||
# Makefile for PL/Perl
|
# Makefile for PL/Perl
|
||||||
# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.21 2005/05/24 08:05:36 neilc Exp $
|
# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.22 2005/05/24 17:07:41 tgl Exp $
|
||||||
|
|
||||||
subdir = src/pl/plperl
|
subdir = src/pl/plperl
|
||||||
top_builddir = ../../..
|
top_builddir = ../../..
|
||||||
@ -47,6 +47,27 @@ all: all-lib
|
|||||||
SPI.c: SPI.xs
|
SPI.c: SPI.xs
|
||||||
$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
|
$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
|
||||||
|
|
||||||
|
# When doing a VPATH build, copy over the .sql and .out files so that the
|
||||||
|
# test script can find them. See comments in src/test/regress/GNUmakefile.
|
||||||
|
ifdef VPATH
|
||||||
|
|
||||||
|
ifneq ($(PORTNAME),win32)
|
||||||
|
abs_srcdir := $(shell cd $(srcdir) && pwd)
|
||||||
|
abs_builddir := $(shell pwd)
|
||||||
|
else
|
||||||
|
abs_srcdir := $(shell cd $(srcdir) && pwd -W)
|
||||||
|
abs_builddir := $(shell pwd -W)
|
||||||
|
endif
|
||||||
|
|
||||||
|
test_files_src := $(wildcard $(srcdir)/sql/*.sql) $(wildcard $(srcdir)/expected/*.out)
|
||||||
|
test_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(test_files_src))
|
||||||
|
|
||||||
|
all: $(test_files_build)
|
||||||
|
$(test_files_build): $(abs_builddir)/%: $(srcdir)/%
|
||||||
|
ln -s $< $@
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
install: all installdirs
|
install: all installdirs
|
||||||
ifeq ($(enable_shared), yes)
|
ifeq ($(enable_shared), yes)
|
||||||
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX)
|
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.20 2005/05/17 18:26:23 tgl Exp $
|
# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.21 2005/05/24 17:07:41 tgl Exp $
|
||||||
|
|
||||||
subdir = src/pl/plpython
|
subdir = src/pl/plpython
|
||||||
top_builddir = ../../..
|
top_builddir = ../../..
|
||||||
@ -66,6 +66,27 @@ include $(top_srcdir)/src/Makefile.shlib
|
|||||||
|
|
||||||
all: all-lib
|
all: all-lib
|
||||||
|
|
||||||
|
# When doing a VPATH build, copy over the .sql and .out files so that the
|
||||||
|
# test script can find them. See comments in src/test/regress/GNUmakefile.
|
||||||
|
ifdef VPATH
|
||||||
|
|
||||||
|
ifneq ($(PORTNAME),win32)
|
||||||
|
abs_srcdir := $(shell cd $(srcdir) && pwd)
|
||||||
|
abs_builddir := $(shell pwd)
|
||||||
|
else
|
||||||
|
abs_srcdir := $(shell cd $(srcdir) && pwd -W)
|
||||||
|
abs_builddir := $(shell pwd -W)
|
||||||
|
endif
|
||||||
|
|
||||||
|
test_files_src := $(wildcard $(srcdir)/sql/*.sql) $(wildcard $(srcdir)/expected/*.out)
|
||||||
|
test_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(test_files_src))
|
||||||
|
|
||||||
|
all: $(test_files_build)
|
||||||
|
$(test_files_build): $(abs_builddir)/%: $(srcdir)/%
|
||||||
|
ln -s $< $@
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
install: all installdirs
|
install: all installdirs
|
||||||
ifeq ($(enable_shared), yes)
|
ifeq ($(enable_shared), yes)
|
||||||
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX)
|
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX)
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Makefile for the pltcl shared object
|
# Makefile for the pltcl shared object
|
||||||
#
|
#
|
||||||
# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.46 2005/05/17 18:26:23 tgl Exp $
|
# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.47 2005/05/24 17:07:41 tgl Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -50,6 +50,27 @@ ifeq ($(TCL_SHARED_BUILD), 1)
|
|||||||
all: all-lib
|
all: all-lib
|
||||||
$(MAKE) -C modules $@
|
$(MAKE) -C modules $@
|
||||||
|
|
||||||
|
# When doing a VPATH build, copy over the .sql and .out files so that the
|
||||||
|
# test script can find them. See comments in src/test/regress/GNUmakefile.
|
||||||
|
ifdef VPATH
|
||||||
|
|
||||||
|
ifneq ($(PORTNAME),win32)
|
||||||
|
abs_srcdir := $(shell cd $(srcdir) && pwd)
|
||||||
|
abs_builddir := $(shell pwd)
|
||||||
|
else
|
||||||
|
abs_srcdir := $(shell cd $(srcdir) && pwd -W)
|
||||||
|
abs_builddir := $(shell pwd -W)
|
||||||
|
endif
|
||||||
|
|
||||||
|
test_files_src := $(wildcard $(srcdir)/sql/*.sql) $(wildcard $(srcdir)/expected/*.out)
|
||||||
|
test_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(test_files_src))
|
||||||
|
|
||||||
|
all: $(test_files_build)
|
||||||
|
$(test_files_build): $(abs_builddir)/%: $(srcdir)/%
|
||||||
|
ln -s $< $@
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
install: all installdirs
|
install: all installdirs
|
||||||
ifeq ($(enable_shared), yes)
|
ifeq ($(enable_shared), yes)
|
||||||
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
|
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user