X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2Fautomake.mk;h=d329080dd3cc184090f37b5fd4b25219e7ec606e;hb=refs%2Ftags%2Fbuild49;hp=7fad5e425c3930ea4ba256cb4cf889ce4e452fbf;hpb=cd2a72711236a924ad05c6c1fff9055eaa0db64d;p=pspp-builds.git

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 7fad5e42..d329080d 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -25,21 +25,18 @@ perl-module/pspp-module-config: Makefile
 	echo ');' >> $$target ;\
 	cp $$target $(top_builddir)/perl-module/pspp-module-config
 
-
-
 perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
 	cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
 
-
-perl-module/PSPP-Perl-$(VERSION).tar.gz: $(module_sources)
+perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources)
 	$(RM) $@
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
 
-.PHONY: module-make
-module-make: perl-module/Makefile
+PHONY += module-make
+module-make: perl-module/Makefile src/libpspp-core.la
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
-all-local: 
+perl_module_tarball:
 	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
 	 for f in $(module_sources); do \
 	  destdir=`dirname $$f` ;\
@@ -50,23 +47,26 @@ all-local:
 	  fi ; \
 	 done \
 	fi
-	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION).tar.gz
+	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
+
+ALL_LOCAL += perl_module_tarball
 
 check-local:
 	loc=`pwd` ; cd $(top_builddir)/src/.libs ; llp=`pwd` ; cd $$loc ;  \
-	LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test"
+	LANG=C LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test"
 
 
-clean-local:
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean
+perl_module_CLEAN:
+	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true
 	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
 	  $(RM) $(module_sources) ; \
 	fi
 	$(RM) perl-module/Makefile.old
 
+CLEAN_LOCAL += perl_module_CLEAN
 
 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