From: Ben Pfaff <blp@gnu.org>
Date: Sat, 20 Feb 2010 01:14:49 +0000 (-0800)
Subject: doc: Do not remove pspp.xml upon "make distclean".
X-Git-Tag: v0.7.5~149
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a962b097392b6d20c44e8b30eb3f70fa6feda61a;p=pspp-builds.git

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 06eb3bb1..c3755566 100644
--- 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 7645925b..b31aa769 100644
--- 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)