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

diff --git a/build-pspp b/build-pspp
index ae723f7de4..811a39f33d 100755
--- a/build-pspp
+++ b/build-pspp
@@ -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);
@@ -314,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");