From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 25 Dec 2008 02:53:27 +0000 (+0900)
Subject: Merge branch 'master' of /home/john/Development/pspp-bare
X-Git-Tag: v0.7.1~1^2~15
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ef31dd13db451889d03408cf07ed04d47000b06;hp=591e1f9d131470cdd92a2ea3f15d9ae53be36918;p=pspp-builds.git

Merge branch 'master' of /home/john/Development/pspp-bare
---

diff --git a/perl-module/Makefile.PL b/perl-module/Makefile.PL
index dfa235e7..77505f2f 100644
--- a/perl-module/Makefile.PL
+++ b/perl-module/Makefile.PL
@@ -5,8 +5,9 @@ use ExtUtils::MakeMaker;
 
 
 do 'pspp-module-config' || do {
-    my $src = prompt ("Enter the location of the full pspp source","../pspp");
-    my $build = prompt ("Enter the location of the pspp build directory", "$src" );
+    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 c502cbe8..2b838313 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -33,9 +33,10 @@ perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
 module-make: perl-module/Makefile
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
-perl-module/lib/pspp-vers.pl: src/libpspp/version.c
+perl-module/lib/pspp-vers.pl: src/libpspp/version.c Makefile
 	mkdir -p perl-module/lib
-	$(GREP) '^\$$VERSION' $(top_builddir)/src/libpspp/version.c | $(SED) -e 's/VERSION/PSPP::VERSION/' > $@
+	(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
 	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
diff --git a/perl-module/lib/PSPP.pm b/perl-module/lib/PSPP.pm
index f99afde3..a000b011 100644
--- a/perl-module/lib/PSPP.pm
+++ b/perl-module/lib/PSPP.pm
@@ -4,7 +4,7 @@ use warnings;
 
 =head1 NAME
 
-PSPP - Perl extension to PSPP
+PSPP-Perl - Perl extension to PSPP
 
 =head1 SYNOPSIS
 
@@ -12,8 +12,8 @@ PSPP - Perl extension to PSPP
 
 =head1 DESCRIPTION
 
-PSPP:: provides an interface to the libraries used by pspp to create
-system files.  
+PSPP-Perl provides an interface to the libraries used by pspp to read and
+write system files.  
 
 =head1 EXPORT