Automatically detect src dir from build dir

diff --git a/perl-module/Makefile.PL b/perl-module/Makefile.PL
index dfa235e76562f07a31d7f2053cdb9aaf590f010f..77505f2f27ecaa5e4b5f14a1afdecb6938611992 100644 (file)
--- 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 c502cbe8b88d763b87e393a7dd61150d4e15e4c2..2b83831366c29537c77af53f81fd0d6894054b95 100644 (file)
--- 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 \