X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2Fautomake.mk;h=9527dbbd528feffd755b908c6ff892e554a6cc94;hb=38d5e09c01ddffc98430c3c55ed3ccb821180cbf;hp=c502cbe8b88d763b87e393a7dd61150d4e15e4c2;hpb=27a0c1b1d9dc57d2109d8accfccd8df1303d8c46;p=pspp-builds.git

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index c502cbe8..9527dbbd 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -25,45 +25,45 @@ 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)
 
-module-make: perl-module/Makefile
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
+perl-module/PSPP-Perl-$(VERSION).tar.gz: $(module_sources)
+	$(RM) $@
+	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
 
-perl-module/lib/pspp-vers.pl: src/libpspp/version.c
-	mkdir -p perl-module/lib
-	$(GREP) '^\$$VERSION' $(top_builddir)/src/libpspp/version.c | $(SED) -e 's/VERSION/PSPP::VERSION/' > $@
+PHONY += module-make
+module-make: perl-module/Makefile src/libpspp-core.la
+	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
-all-local: perl-module/lib/pspp-vers.pl
+all-local: 
 	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 \
 		 cp $(top_srcdir)/$$f $$destdir ; \
+		 echo cp $(top_srcdir)/$$f $$destdir ; \
 	  fi ; \
 	 done \
 	fi
-	$(MAKE) $(AM_MAKEFLAGS) module-make
+	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION).tar.gz
 
 check-local:
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test
+	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"
 
 
 clean-local:
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) 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
 
-
 CLEANFILES += \
+        perl-module/PSPP-Perl-$(VERSION).tar.gz \
 	perl-module/pspp-module-config \
-	perl-module/lib/pspp-vers.pl \
 	perl-module/const-c.inc \
 	perl-module/const-xs.inc