From: Ben Pfaff Date: Sat, 16 Oct 2010 20:49:37 +0000 (-0700) Subject: doc: Always build ni.texi, tut.texi in source directory. X-Git-Tag: v0.7.6~1 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af0a4711a0421f49c4d69cdffbdeae6572eb8d48;p=pspp-builds.git 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 . --- diff --git a/doc/automake.mk b/doc/automake.mk index af99930f..d3c91a26 100644 --- 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 42e02b7c..39c3a670 100644 --- 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 994c0a7f..2432dc3e 100644 --- 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