perl-module: Additional fixes for Perl version number on PSPP autobuilder.

[pspp-builds.git] / perl-module / automake.mk

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index f3bfdaf33711137b6a884c4a90b7e1f57e579216..d329080dd3cc184090f37b5fd4b25219e7ec606e 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -28,15 +28,15 @@ perl-module/pspp-module-config: Makefile
 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
+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` ;\
@@ -47,22 +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