From 1feb24f28b2660e6ea4edc6c1ed4e4f56525c9a5 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 27 Nov 2020 18:56:35 -0800
Subject: [PATCH] doc: Make figure references relative to doc/, not to
 doc/pspp-figures.

This frame of reference is what the viewers for the generated XML and Info
files expect (from testing).  It also seems to be what the Makefile expects
since this allows us to eliminate a couple of include directory options.
---
 doc/automake.mk | 7 ++-----
 doc/pspp.texi   | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/doc/automake.mk b/doc/automake.mk
index 4e23a1c4be..afa84df980 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -81,8 +81,8 @@ doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list
 if BROKEN_DOCBOOK_XML
 	touch $@
 else
-	$(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
-		$< -o $@
+	$(AM_V_GEN)$(MAKEINFO) --docbook $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+		-I doc -I $(srcdir)/doc $< -o $@
 endif
 
 docbookdir = $(docdir)
@@ -107,9 +107,6 @@ EXTRA_DIST += \
 	doc/pspp-manual.css
 
 
-AM_MAKEINFOFLAGS=-I $(top_srcdir)/doc/pspp-figures -I $(top_builddir)/doc/pspp-figures
-am__TEXINFO_TEX_DIR=:$(top_srcdir)/doc/pspp-figures:$(top_builddir)/doc/pspp-figures
-
 ################# Example programs ##############################
 
 FIGURE_SYNTAX = \
diff --git a/doc/pspp.texi b/doc/pspp.texi
index 6914697691..1af4275be0 100644
--- a/doc/pspp.texi
+++ b/doc/pspp.texi
@@ -36,7 +36,7 @@ graphic user interface
 @macro psppoutput{FILE}
 @ifnothtml
 @smallexample
-@include \FILE\.texi
+@include pspp-figures/\FILE\.texi
 @end smallexample
 @end ifnothtml
 @ifhtml
@@ -44,7 +44,7 @@ graphic user interface
 @html
 
 <div class="pspp">
-@include \FILE\.html
+@include pspp-figures/\FILE\.html
 </div>
 
 @end html
-- 
2.30.2