X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2Fautomake.mk;h=fae888633b2e8625a9cd001b80ff7bde6275ae66;hb=refs%2Fheads%2Flexer;hp=8eeb0a341ddd0c96a7a70bf6438c6167d391f09e;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 8eeb0a341d..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,35 +25,31 @@ 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 ;\
-	  if test "$(top_srcdir)/$$f" -nt "$(top_builddir)/$$f" ; then \
+	  if test ! -e "$(top_builddir)/$$f" || \
+	     test "$(top_srcdir)/$$f" -nt "$(top_builddir)/$$f" ; then \
 		 cp $(top_srcdir)/$$f $$destdir ; \
 		 echo cp $(top_srcdir)/$$f $$destdir ; \
 	  fi ; \
 	 done \
 	fi
-	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
-
-CHECK_LOCAL += perl_module_check
-perl_module_check:
-	loc=`pwd` ; cd $(top_builddir)/src/.libs ; llp=`pwd` ; cd $$loc ;  \
-	LANG=C LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test"
+	$(MAKE) $(PERL_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
 
 CLEAN_LOCAL += perl_module_clean
 perl_module_clean: