[nautilus-actions] Reference Manual: fix the build



commit 27c6b3faa03e202208e0cb0a4ee4bd238eb20aa1
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Dec 13 23:37:31 2011 +0100

    Reference Manual: fix the build

 ChangeLog                  |    2 ++
 docs/reference/Makefile.am |   15 ++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index eeeffa3..11d3c54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-12-13 Pierre Wieser <pwieser trychlos org>
 
+	* docs/reference/Makefile.am: Fix (one more time) the build.
+
 	* docs/reference/nautilus-actions-sections.txt: Add new functions.
 
 	Have a distinct interface definition for import assistant.
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index e81e880..6d71dbc 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -51,11 +51,12 @@ core_headers = $(patsubst $(top_srcdir)/src/core/%,%,$(shell \ls -1 $(top_srcdir
 #written_xmls = $(shell \ls -1 *.xml | $(EGREP) -v "$(written_xmls_regexp)")
 
 # content_files must include auto created ones because content_files is
-# a prerequisite of sgml-build-stamp target; we so are sure that these
-# files are actually generated (version_dir.xml)
-# as a consequence, auto created files are automatically included in the
-# tarball
-content_files = $(shell \ls -1 *.xml) $(auto_created_files)
+# a prerequisite of html-build-stamp and pdf-build-stamp targets;
+# we so are sure that these will be actually generated (version.xml, version_dir.xml)
+# as a consequence, auto created files are automatically included in the tarball
+content_files = \
+	$(patsubst $(abs_srcdir)/%,%,$(shell \ls -1 $(abs_srcdir)/*.xml)) \
+	$(auto_created_files)
 
 if !HAVE_GCONF
 ignore_headers = na-gconf-monitor.h
@@ -151,12 +152,8 @@ xml_in_files = \
 
 xml_files = $(xml_in_files:.xml.in=.xml)
 
-# even auto-generated .xml files should go to srcdir
-# else xml processor will not be able to parse entities
 version_dir.xml: version.xml
-	rm -f version_dir.xml
 	cat version.xml | $(SED) 's?^\([[:alnum:]]\.[[:alnum:]]\).*?\1?' > version_dir.xml
-	if test "$(abs_srcdir)" != "$(abs_builddir)"; then cp version.xml version_dir.xml $(srcdir)/; fi
 
 CLEANFILES += \
 	$(DOC_MODULE).types							\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]