doc: Do not remove pspp.xml upon "make distclean".

Reported by Harry Thijssen <pspp@sjpaes.nl>.

diff --git a/doc/.gitignore b/doc/.gitignore
index 06eb3bb18a49b17bb6a488f2c2a259d95e6be159..c375556614708dbe4d085e3066efc56809a0007e 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -3,6 +3,7 @@ Makefile.in
 ni.texi
 pspp-dev.info
 pspp.info*
+pspp.xml
 stamp-1
 stamp-vti
 version-dev.texi

diff --git a/doc/automake.mk b/doc/automake.mk
index 7645925bddf83cb65de71550ea5ff1fcd3d540d5..b31aa769b48291670e0ffeb7e8162c13ca4a8f8c 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -52,7 +52,7 @@ doc/tut.texi:
        echo "@set example-dir $(examplesdir)" > $@
 
 
-doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+$(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
        @$(MKDIR_P)  doc
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
                $(top_srcdir)/doc/pspp.texinfo -o - \
@@ -60,8 +60,7 @@ doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
        $(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false )
 
 docbookdir = $(docdir)
-docbook_DATA = doc/pspp.xml
-EXTRA_DIST += doc/pspp.xml
+dist_docbook_DATA = doc/pspp.xml
 
 EXTRA_DIST += doc/OChangeLog
 CLEANFILES += pspp-dev.dvi $(docbook_DATA)