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=0b6c1e0879e59576a676b54e00a0494b792b5f00;hpb=deb4fd96c0c171fc8eb64f7f1e7f5c2af4931416;p=pspp

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 0b6c1e0879..fae888633b 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -15,54 +15,52 @@ 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
-	target=`mktemp`;\
-	echo '%Locations = (' > $$target ;\
-	printf "  SourceDir => '" >> $$target ;\
-	(cd $(top_srcdir) && echo `pwd`\', ) >> $$target ;\
-	printf "  BuildDir => '" >> $$target ;\
-	(cd $(top_builddir) && echo `pwd`\' ) >> $$target ;\
-	echo ');' >> $$target ;\
-	cp $$target $(top_builddir)/perl-module/pspp-module-config
+	(echo '%Locations = (';\
+	 printf "  SourceDir => '";\
+	 (cd $(top_srcdir) && echo `pwd`\', ) ;\
+	 printf "  BuildDir => '";\
+	 (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).tar.gz: $(module_sources)
-	$(RM) $@
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
+perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
+	rm -f $@
+	cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) tardist
 
 PHONY += module-make
 module-make: perl-module/Makefile
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
+	cd perl-module && $(MAKE) $(PERL_MAKEFLAGS)
 
-all-local: 
-	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
+ALL_LOCAL += perl_module_tarball
+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).tar.gz
-
-check-local:
-	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:
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean
+CLEAN_LOCAL += perl_module_clean
+perl_module_clean:
+	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true
 	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
-	  $(RM) $(module_sources) ; \
+	  rm -f $(module_sources) ; \
 	fi
-	$(RM) perl-module/Makefile.old
+	rm -f perl-module/Makefile.old
 
 CLEANFILES += \
-        perl-module/PSPP-Perl-$(VERSION).tar.gz \
+        perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz \
 	perl-module/pspp-module-config \
 	perl-module/const-c.inc \
 	perl-module/const-xs.inc