X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-pspp;h=811a39f33defc373e8b70d96176e6f9306dded0e;hb=6d7df444997670f97a367b89fab6c0f5d8ecc4fd;hp=d45a9efba7990d224d093790f0e8e7d51ff8969a;hpb=1980277eeb220c5ea63accc38d8b65ef4bd3a0a3;p=pspp

diff --git a/build-pspp b/build-pspp
index d45a9efba7..811a39f33d 100755
--- a/build-pspp
+++ b/build-pspp
@@ -66,6 +66,8 @@ chomp $build_host;
 set_var ("build_host", $build_host);
 set_var ("build_number", $build_number);
 
+our $GIT = "git --git-dir=$topdir/.git";
+
 sub start_step {
     my ($msg) = @_;
     print LOG "\n$msg\n";
@@ -122,8 +124,6 @@ sub ref_to_commit {
     return $commit;
 }
 
-my $GIT = "git --git-dir=$topdir/.git";
-
 if (@ARGV == 2) {
     my ($repo, $branch) = @ARGV;
 
@@ -268,13 +268,12 @@ EOF
 
     # Build user manual
     start_step ("Build user manual");
-    run ("cd pspp && cp _build/doc/*.texi doc/");
-    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texinfo -o $resultsdir/user-manual --email bug-gnu-pspp\@gnu.org pspp \"GNU PSPP User Manual\"", "user-manual");
+    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp.texinfo -I doc -o $resultsdir/user-manual --email bug-gnu-pspp\@gnu.org pspp \"GNU PSPP User Manual\"", "user-manual");
     saved_result ("User Manual", "user-manual");
 
     # Build developer's guide
     start_step ("Build developers guide");
-    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texinfo -o $resultsdir/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-guide");
+    run ("cd pspp && GENDOCS_TEMPLATE_DIR=$topdir $topdir/gendocs.sh -s doc/pspp-dev.texinfo -I doc -o $resultsdir/dev-guide --email bug-gnu-pspp\@gnu.org pspp-dev \"GNU PSPP Developers Guide\"", "dev-guide");
     saved_result ("Developers Guide", "dev-guide");
 } else {
     $tarball = saved_result ("source distribution", $tarball);
@@ -286,6 +285,11 @@ if ($build_binary) {
     set_var ("dist_ref", "refs/builds/$build_number/dist");
     set_var ("dist_commit", ref_to_commit ("refs/builds/$build_number/dist"));
 
+    start_step ("Determining $tarball target directory");
+    my $sample_filename = `zcat $tarball | tar tf - | head -1`;
+    my ($tarball_dir) = $sample_filename =~ m%^(?:[./])*([^/]+)/%;
+    set_var ("dist_dir", $tarball_dir);
+
     start_step ("Extracting source tarball");
     run ("zcat $tarball | (cd $builddir && tar xf -)");
 
@@ -309,7 +313,7 @@ if ($build_binary) {
     fail () if !$ok;
 
     start_step ("Build");
-    run ("cd $builddir/$tarball_dir/_build && make", "build");
+    run ("cd $builddir/$tarball_dir/_build && make -j2", "build");
 
     start_step ("Install");
     run ("cd $builddir/$tarball_dir/_build && make install DESTDIR=\$PWD/pspp-$binary_version", "install");