X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2Fautomake.mk;h=fae888633b2e8625a9cd001b80ff7bde6275ae66;hb=eb067c749f97b505d74f5b89573ff287078b833c;hp=b689fd19ebdfeb2b36bc3f109166c2bd24bfb90c;hpb=fb2f5ddb7eb9396936e6712ab39a3dca08ec7f1e;p=pspp

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index b689fd19eb..fae888633b 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -15,6 +15,8 @@ module_sources = \
  perl-module/lib/PSPP.pm \
  perl-module/t/Pspp.t
 
+PERL_MAKEFLAGS = $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir)
+
 perl-module/pspp-module-config: Makefile
 	(echo '%Locations = (';\
 	 printf "  SourceDir => '";\
@@ -23,20 +25,20 @@ perl-module/pspp-module-config: Makefile
 	 (cd $(top_builddir) && echo `pwd`\' );\
 	 echo ');') > $(top_builddir)/perl-module/pspp-module-config
 
-perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
+perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config $(module_sources)
 	cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
 
-perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources)
+perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
 	rm -f $@
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
+	cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) tardist
 
 PHONY += module-make
-module-make: perl-module/Makefile src/libpspp-core.la
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
+module-make: perl-module/Makefile
+	cd perl-module && $(MAKE) $(PERL_MAKEFLAGS)
 
 ALL_LOCAL += perl_module_tarball
-perl_module_tarball:
-	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
+perl_module_tarball: $(module_sources) src/libpspp-core.la
+	@if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
 	 for f in $(module_sources); do \
 	  destdir=`dirname $$f` ;\
 	  mkdir -p $$destdir ;\
@@ -47,7 +49,7 @@ perl_module_tarball:
 	  fi ; \
 	 done \
 	fi
-	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
+	$(MAKE) $(PERL_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
 
 CLEAN_LOCAL += perl_module_clean
 perl_module_clean: