Remove pspp-vers.pl which did more harm than good.

Removed the auto-generated file pspp-vers.pl and all references
to it.  Instead, use a manually set string for the version.

diff --git a/perl-module/MANIFEST b/perl-module/MANIFEST
index ce868d5dc11a99fb2e2f1dbd338d7f226218a078..254690556deecc723f83b7ee4f4f255f7b8f75f2 100644 (file)
--- a/perl-module/MANIFEST
+++ b/perl-module/MANIFEST
@@ -4,7 +4,6 @@ const-xs.inc
 COPYING
 Examples.pod
 lib/PSPP.pm
-lib/pspp-vers.pl
 Makefile.PL
 MANIFEST
 ppport.h

diff --git a/perl-module/Makefile.PL b/perl-module/Makefile.PL
index fcb4db055911064e9a0b998b5ae29eb9526d0070..045b4e767710e0ba7b2d43b21c03c0a07316cb6b 100644 (file)
--- a/perl-module/Makefile.PL
+++ b/perl-module/Makefile.PL
@@ -6,7 +6,6 @@ use ExtUtils::MakeMaker;
 
 do 'pspp-module-config' || do {
     my $build = prompt ("Enter the location of the build directory of the configured pspp source:", "" );
-    do 'lib/pspp-vers.pl' || die "No version info";
     my $src = $top_srcdir;
 
     %Locations = (SourceDir => "$src", BuildDir => "$build");

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 71d589f516b7053b074907d4b45fda762ffcc709..9619dfe0b109bf34c8da78c40809fdc27fbab95d 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -39,12 +39,7 @@ PSPP-Perl-$(VERSION).tar.gz:
 module-make: perl-module/Makefile
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
-perl-module/lib/pspp-vers.pl: src/libpspp/version.c Makefile
-       mkdir -p perl-module/lib
-       (cd $(top_srcdir) && echo "\$$top_srcdir='"`pwd`"';") > $@
-       $(GREP) '^\$$VERSION' $(top_builddir)/src/libpspp/version.c | $(SED) -e 's/VERSION/PSPP::VERSION/' >> $@
-
-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` ;\
@@ -58,7 +53,7 @@ all-local: perl-module/lib/pspp-vers.pl
 
 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 "
+       LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test"
 
 
 clean-local:
@@ -72,7 +67,6 @@ clean-local:
 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 
 

diff --git a/perl-module/lib/PSPP.pm b/perl-module/lib/PSPP.pm
index ab656415c3305eee8ff6d17d2864e1e5ad00e124..a56ff4b756d81dcd6fd3136f775ddb615a8b0bff 100644 (file)
--- a/perl-module/lib/PSPP.pm
+++ b/perl-module/lib/PSPP.pm
@@ -21,7 +21,7 @@ None by default.
 
 =cut
 BEGIN {
-       do 'pspp-vers.pl' || die "No version set";
+       $PSPP::VERSION='0.7.0';
        require XSLoader;
        XSLoader::load('PSPP', $PSPP::VERSION);
 }

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 538ce3a984537c9ade70d35bdb1066d06a6fad56..9eed00276db9f03eb33ea74058db61cad1b8a0d3 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -75,7 +75,7 @@ src_libpspp_libpspp_la_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
 
 nodist_src_libpspp_libpspp_la_SOURCES = src/libpspp/version.c
 
-src/libpspp/version.c: $(top_srcdir)/AUTHORS
+src/libpspp/version.c: $(top_srcdir)/AUTHORS $(top_builddir)/Makefile
        @$(MKDIR_P) src/libpspp
        echo "/*        -*- mode: c; buffer-read-only: t -*-" > $@
        echo "   Generated by src/libpspp/automake.mk --- Do not edit.">> $@