Fix makefile so it works for VPATH case.

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 8989b14679839d074e4ebbba7f9ffe3e2787912f..18c8addf2991da52c6f7fccb29570ba08a5c356c 100644 (file)
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -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