From c79640efb2a1c388fa48025fcb7d6586775465d4 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 9 Jan 2010 03:53:40 +0000 Subject: [PATCH] Fix makefile so it works for VPATH case. --- src/pl/plperl/GNUmakefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 8a30a62687..a241cbce29 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -1,5 +1,5 @@ # Makefile for PL/Perl -# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.38 2010/01/09 02:40:50 adunstan Exp $ +# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.39 2010/01/09 03:53:40 tgl Exp $ subdir = src/pl/plperl top_builddir = ../../.. @@ -27,7 +27,7 @@ override CPPFLAGS += -DPLPERL_HAVE_UID_GID override CFLAGS += -Wno-comment endif -override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE +override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE rpathdir = $(perl_archlibexp)/CORE @@ -36,6 +36,8 @@ NAME = plperl OBJS = plperl.o spi_internal.o SPI.o +PERLCHUNKS = plc_perlboot.pl plc_safe_bad.pl plc_safe_ok.pl + SHLIB_LINK = $(perl_embed_ldflags) REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl @@ -47,8 +49,8 @@ include $(top_srcdir)/src/Makefile.shlib plperl.o: perlchunks.h -perlchunks.h: plc_*.pl - $(PERL) text2macro.pl --strip='^(\#.*|\s*)$$' plc_*.pl > perlchunks.htmp +perlchunks.h: $(PERLCHUNKS) + $(PERL) $(srcdir)/text2macro.pl --strip='^(\#.*|\s*)$$' $^ > perlchunks.htmp mv perlchunks.htmp perlchunks.h all: all-lib -- 2.40.0