Merge commit 'HEAD'; commit 'savannah/master'

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

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 9619dfe0b109bf34c8da78c40809fdc27fbab95d..0b6c1e0879e59576a676b54e00a0494b792b5f00 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -25,17 +25,14 @@ 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)
 
-
-PSPP-Perl-$(VERSION).tar.gz:
-       cd perl-module && $(RM) $@
+perl-module/PSPP-Perl-$(VERSION).tar.gz: $(module_sources)
+       $(RM) $@
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
 
-.PHONY: module-make
+PHONY += module-make
 module-make: perl-module/Makefile
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
@@ -46,14 +43,15 @@ all-local:
          mkdir -p $$destdir ;\
          if 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 PSPP-Perl-$(VERSION).tar.gz
+       $(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 ;  \
-       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:
@@ -63,7 +61,6 @@ clean-local:
        fi
        $(RM) perl-module/Makefile.old
 
-
 CLEANFILES += \
         perl-module/PSPP-Perl-$(VERSION).tar.gz \
        perl-module/pspp-module-config \