doc: Make figure references relative to doc/, not to doc/pspp-figures.

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 4e23a1c4bea44032a519ad6673e2f829bd5ccc7e..afa84df980d2a676ee7adb796908cdad6cf822b5 100644 (file)
--- 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 = \