doc: Always build ni.texi, tut.texi in source directory.

When the source and build directories are different, ni.texi and tut.texi
were being built in the build directory.  This meant that, since
$(builddir)/doc is not in the TeX search path, but $(builddir) is (because
it is the working directory when TeX is invoked), the @include commands
that include ni.texi and tut.texi had to specify doc/ explicitly.
However, doing that broke the case where the source and build directories
were different but ni.texi or tut.texi were in the source directory (which
happens when building from a tarball or, similarly, running "make
distcheck"), because $(top_srcdir) is not in the TeX search path (only
$(top_srcdir)/doc is).

The easiest solution appears to be to always make sure that ni.texi and
tut.texi are in the source directory.  Then they are always in the TeX
search path (as long as we drop the doc/ prefix) and everything should
work out OK.

Reported by Michel Boaventura <michel@michelboaventura.com>.

diff --git a/doc/automake.mk b/doc/automake.mk
index af99930f875a08b537498209724de5ec20aced57..d3c91a26417e712e00c5522f62113212e82d929d 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -43,11 +43,11 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 EXTRA_DIST += doc/pspp.man \
        doc/get-commands.pl
 
-doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
+$(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
        @$(MKDIR_P)  doc
        $(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
 
-doc/tut.texi:
+$(srcdir)/doc/tut.texi:
        @$(MKDIR_P) doc
        echo "@set example-dir $(examplesdir)" > $@
 

diff --git a/doc/not-implemented.texi b/doc/not-implemented.texi
index 42e02b7c8f22ee0d4206fc6d7527a64a8e52c32d..39c3a670418b1a3c479c12226c3cbf0ac1a06122 100644 (file)
--- a/doc/not-implemented.texi
+++ b/doc/not-implemented.texi
@@ -7,5 +7,5 @@ implemented.
 @cindex unimplemented commands
 @cindex commands, unimplemented
 
-@include doc/ni.texi
+@include ni.texi
 

diff --git a/doc/tutorial.texi b/doc/tutorial.texi
index 994c0a7fc90028e5ffab058d92b3849aaf2520d0..2432dc3e510c263c2e28c17b9d713d9f72b6010a 100644 (file)
--- a/doc/tutorial.texi
+++ b/doc/tutorial.texi
@@ -1,6 +1,6 @@
 @alias prompt = sansserif
 
-@include doc/tut.texi
+@include tut.texi
 
 @node Using PSPP
 @chapter Using PSPP