From 358269be3e25160ad3dc6324eae4d61ec6f1ac5a Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Thu, 14 Jun 2007 11:56:35 +0000
Subject: [PATCH] 2007-06-07  Emmanuele Bassi  <ebassi@openedhand.com>

	* configure.ac:
	* doc/manual/Makefile.am: Find xmlto and jw in the path and
	use the symbolic names when building the manual.
---
 ChangeLog              |  6 ++++++
 configure.ac           |  7 +++++++
 doc/manual/Makefile.am | 19 ++++++++++---------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c0b6f802..60cf72070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-07  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* configure.ac:
+	* doc/manual/Makefile.am: Find xmlto and jw in the path and
+	use the symbolic names when building the manual.
+
 2007-06-14  Tomas Frydrych  <tf@openedhand.com>
 
 	* clutter/clutter-actor.c:
diff --git a/configure.ac b/configure.ac
index 43eee196d..35d88ffda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,6 +262,13 @@ AC_ARG_ENABLE(manual,
                              [Build application developers manual. Requires jw and xmlto binaries.]),
               enable_manual=$enableval, enable_manual=no)
 
+if "x$enable_manual" = "xyes"; then
+  AC_PATH_PROG(JW, jw)
+  AC_PATH_PROG(XMLTO, xmlto)
+  AC_SUBST(JW)
+  AC_SUBST(XMLTO)
+fi
+
 AM_CONDITIONAL(ENABLE_MANUAL, test x$enable_manual != xno)
 
 dnl ========================================================================
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 9f8663f52..06a40c92a 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -5,19 +5,20 @@ EXTRA_DIST =  clutter-manual.xml.in manual.xsl style.css $(srcdir)/$(IMAGE_FILES
 CLEANFILES = pdf-build.stamp txt-build.stamp htmldoc-build.stamp clutter-manual.xml
 
 pdf-build.stamp: clutter-manual.xml
-	SP_ENCODING=XML SP_CHARSET_FIXED=YES jw -b pdf $(srcdir)/clutter-manual.xml 
-	mv $(srcdir)/clutter-manual.pdf clutter-manual-@CLUTTER_MAJORMINOR@.pdf
+	SP_ENCODING=XML SP_CHARSET_FIXED=YES $(JW) \
+		-b pdf $(srcdir)/clutter-manual.xml && \
+	mv $(srcdir)/clutter-manual.pdf clutter-manual-@CLUTTER_MAJORMINOR@.pdf && \
 	touch pdf-build.stamp
 
-txt-build.stamp: clutter-manual.xml 
-	xmlto txt $(srcdir)/clutter-manual.xml
-	mv $(srcdir)/clutter-manual.txt clutter-manual-@CLUTTER_MAJORMINOR@.txt
+txt-build.stamp: clutter-manual.xml
+	$(XMLTO) txt $(srcdir)/clutter-manual.xml && \
+	mv $(srcdir)/clutter-manual.txt clutter-manual-@CLUTTER_MAJORMINOR@.txt && \
 	touch txt-build.stamp
 
 htmldoc-build.stamp: clutter-manual.xml
-	$(mkinstalldirs) html
-	xmlto -m manual.xsl -o html/ xhtml $(srcdir)/clutter-manual.xml
-	cp $(srcdir)/style.css html/
+	$(mkinstalldirs) html && \
+	$(XMLTO) -m manual.xsl -o html/ xhtml $(srcdir)/clutter-manual.xml && \
+	cp $(srcdir)/style.css html/ && \
 	touch htmldoc-build.stamp
 
 doc: txt-build.stamp htmldoc-build.stamp pdf-build.stamp
@@ -60,4 +61,4 @@ install-data-local:
 	  $(INSTALL_DATA) $(srcdir)/clutter-manual-@CLUTTER_MAJORMINOR@.pdf $(DOCDIR)/clutter-manual-@CLUTTER_MAJORMINOR@.pdf; \
 	fi
 
-.PHONY : doc
\ No newline at end of file
+.PHONY : doc