[nautilus-actions] Reference Manual: always allow gtk-doc.make inclusion

[Pierre Wieser <pwieser src gnome org>]

commit d8aeb0712a7b98e2a5b22a6898fad2d93d390e83
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jan 25 22:50:31 2012 +0100

    Reference Manual: always allow gtk-doc.make inclusion
    
    Fix last part of #668181.
    See ChangeLog for a full rationale.

 ChangeLog                  |   12 ++++++++++++
 Makefile.am                |    4 ++--
 docs/reference/Makefile.am |    8 ++++----
 3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ae61c37..a48a716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2012-01-25 Pierre Wieser <pwieser trychlos org>
 
+	* Makefile.am: Build Reference Manual when make distcheck.
+
+	* docs/reference/Makefile.am: Always enable gtk-doc.make inclusion.
+
+	Fix last part of #668181.
+	Rationale is: gtk-doc shamelessly refuses to dist manuals if GTK_DOC is
+	not enabled, i.e. if the manuals have not just been built. Getting rid of
+	this behavior would be possible (just overriding dist-hook target), but
+	same issue arises when installing from a distribution: as GTK_DOC is not
+	enabled, then install target just aborts :(.
+	So it is easier to just enable GTK_DOC when making distcheck.
+
 	* src/api/na-iexporter.h: Fix typo.
 
 	* m4/na-enable-manuals.m4: Remove ENABLE_MANUALS conditional.
diff --git a/Makefile.am b/Makefile.am
index 5b27b8d..33765ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,8 +51,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-as-needed					\
 	--disable-scrollkeeper				\
 	--disable-schemas-install			\
-	--disable-deprecated				\
-	--disable-gtk-doc					\
+	--enable-deprecated					\
+	--enable-gtk-doc					\
 	--disable-html-manuals				\
 	--disable-pdf-manuals				\
 	$(NULL)
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index c29ab97..8b75035 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -30,8 +30,6 @@
 # Nautilus-Actions Reference Manual
 #
 
-if ENABLE_GTK_DOC
-
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
@@ -153,7 +151,8 @@ xml_in_files = \
 xml_files = $(xml_in_files:.xml.in=.xml)
 
 version_dir.xml: version.xml
-	cat version.xml | $(SED) 's?^\([[:alnum:]]\.[[:alnum:]]\).*?\1?' > version_dir.xml
+	rm -f $@
+	cat $< | $(SED) 's?^\([[:alnum:]]\.[[:alnum:]]\).*?\1?' > $@
 
 CLEANFILES += \
 	$(DOC_MODULE).types							\
@@ -164,4 +163,5 @@ install-data-local: install-data-local-hook
 
 install-data-local-hook:
 
-endif
+.PHONY: \
+	install-data-local-hook