[nautilus-actions] No more try to rebuild manuals when making distcheck

[Pierre Wieser <pwieser src gnome org>]

commit 42e312b4a2493c772f77ea60856f8196f8fd0d64
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Nov 25 23:26:17 2011 +0100

    No more try to rebuild manuals when making distcheck

 ChangeLog   |    4 ++++
 Makefile.am |   30 +++++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 92dd2a6..1b1e356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-25 Pierre Wieser <pwieser trychlos org>
 
+	* Makefile.am:
+	No more try to rebuild manuals when making distcheck.
+	Move gnome-doc-utils.make and gtk-doc.make to MAINTAINERCLEANFILES target.
+
 	* run-autogen.sh:
 	Rename 'autogen_target' variable to 'target'.
 	Remove distcheck target as doc is enough to build manuals.
diff --git a/Makefile.am b/Makefile.am
index 72b5b69..d1c9dd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,22 +38,20 @@ SUBDIRS = \
 	tools								\
 	$(NULL)
 
-# a foo directory so that make distcheck has a vpath which is prefixed
-# with a make variable, instead of hardcoded as returned by pkg-config
+# - a foo directory so that make distcheck has a vpath which is prefixed
+#   with a make variable, instead of hardcoded as returned by pkg-config
+# - do not try to install schemas when making distcheck
+# - do not rebuild manuals
 DISTCHECK_CONFIGURE_FLAGS = \
-	--with-nautilus-extdir='$${libdir}/nautilus/extensions-2.0-distcheck'
-
-# do not try to install schemas when making distcheck
-DISTCHECK_CONFIGURE_FLAGS += \
+	--with-nautilus-extdir='$${libdir}/nautilus/extensions-2.0-distcheck' \
 	--enable-silent-rules				\
 	--enable-as-needed					\
-	--enable-deprecated					\
 	--disable-schemas-install			\
+	--disable-deprecated				\
 	--disable-scrollkeeper				\
-	--enable-gtk-doc					\
-	--enable-gtk-doc-pdf				\
-	--enable-html-manuals				\
-	--enable-pdf-manuals				\
+	--disable-gtk-doc					\
+	--disable-html-manuals				\
+	--disable-pdf-manuals				\
 	$(NULL)
 
 EXTRA_DIST = \
@@ -65,13 +63,19 @@ EXTRA_DIST = \
 	$(NULL)
 
 DISTCLEANFILES = \
-	gnome-doc-utils.make				\
-	gtk-doc.make						\
 	intltool-extract					\
 	intltool-merge						\
 	intltool-update						\
 	$(NULL)
 
+# Though the Gnome doc says to add these files to DISTCLEANFILES, the
+# Automake manual states that distclean target should not remove any
+# distributed files (but leave a clean distribution)  
+MAINTAINERCLEANFILES = \
+	gnome-doc-utils.make				\
+	gtk-doc.make						\
+	$(NULL)
+
 pkgdocdir = $(datarootdir)/doc/@PACKAGE -@VERSION@
 
 dist_pkgdoc_DATA = \