[nautilus-actions] docs/nact: do not build when not asked for



commit d82ef810d359ff116aa3fd9d158bbc7d0991a377
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Dec 2 12:08:41 2011 +0100

    docs/nact: do not build when not asked for

 ChangeLog               |    8 ++++++++
 docs/nact/Makefile.am   |   12 +++++++++++-
 m4/na-enable-manuals.m4 |    2 ++
 3 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fab409c..b17af5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-12-02 Pierre Wieser <pwieser trychlos org>
 
+	Do not build the documentation at all if not asked for.
+
+	* m4/na-enable-manuals.m4: new ENABLE_MANUALS conditional.
+
+	* docs/nact/Makefile.am:
+	Make use of new ENABLE_MANUALS conditional.
+	Also test for conditionals when installing.
+
 	* run-autogen.sh: Yet improve the build script.
 
 2011-12-01 Pierre Wieser <pwieser trychlos org>
diff --git a/docs/nact/Makefile.am b/docs/nact/Makefile.am
index f3a8f7d..a79cc2d 100644
--- a/docs/nact/Makefile.am
+++ b/docs/nact/Makefile.am
@@ -54,7 +54,7 @@
 # generate html and pdf NACT user's manuals, with gtk-doc which rather
 # targets the developer documentation (see docs/reference).
 
-if HAVE_GNOME_DOC_UTILS
+if ENABLE_MANUALS
 
 include $(top_srcdir)/gnome-doc-utils.make
 
@@ -195,6 +195,8 @@ $(MANUALS_HTML): %.html: %.xml
 # to <pkgdocdir>/html
 #
 # Note that we do honor here --htmldir autotools configuration option.
+
+if ENABLE_HTML_MANUALS
 install-html-manuals: all-html-manuals install-html-figs install-html-admon
 	for lc in C $(_DOC_REAL_LINGUAS); do \
 		if test "x$(htmldir)" = "x$(docdir)"; then \
@@ -209,6 +211,9 @@ install-html-manuals: all-html-manuals install-html-figs install-html-admon
 			fi; \
 		fi; \
 	done
+else
+install-html-manuals:
+endif
 
 # copied from gnome-doc-utils.make install-doc-figs target
 # modified to install the figures with html manuals
@@ -348,6 +353,8 @@ $(MANUALS_PDF): %.pdf: %.xml
 # in all case, we append the locale as a subdirectory level
 #
 # as pdf are monobloc documents, we do not create a per-document subdir
+
+if ENABLE_PDF_MANUALS
 install-pdf-manuals: all-pdf-manuals
 	if test "$(pdfdir)" = "$(docdir)"; then \
 		_instdir=$(DESTDIR)$(pkgdocdir)/pdf; \
@@ -360,6 +367,9 @@ install-pdf-manuals: all-pdf-manuals
 			cmd="$(INSTALL_DATA) \"$(srcdir)/$$lc/$(DOC_MODULE).pdf\" \"$$_instdir/$$lc/\""; echo $$cmd; (eval $$cmd); \
 		fi; \
 	done
+else
+install-pdf-manuals:
+endif
 
 uninstall-pdf-manuals:
 	if test "$(pdfdir)" = "$(docdir)"; then \
diff --git a/m4/na-enable-manuals.m4 b/m4/na-enable-manuals.m4
index b7f35e2..c64fb03 100644
--- a/m4/na-enable-manuals.m4
+++ b/m4/na-enable-manuals.m4
@@ -51,6 +51,8 @@ AC_DEFUN([NA_ENABLE_MANUALS],[
 	
 	_CHECK_FOR_HTML_MANUALS
 	_CHECK_FOR_PDF_MANUALS
+
+	AM_CONDITIONAL([ENABLE_MANUALS], [test "${enable_html_manuals}" = "yes" -a  "${enable_pdf_manuals}" = "yes" ])
 ])
 
 AC_DEFUN([_AC_ARG_NA_ENABLE_HTML_MANUALS],[



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