[gmime] Fix tutorial generation for DB2HTML changes



commit f33f57d805d81aeda8bbf30657dbdf0851c28026
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Thu Jan 26 20:34:56 2012 -0500

    Fix tutorial generation for DB2HTML changes
    
    DB2HTML is now a path, so in HAVE_DOCBOOK AM_CONDITIONAL we need to test
    it for non-emptiness instead of trying to execute it.
    
    docbook2html uses . as the default output directory, while db2html uses
    gmime-tut by default. We therefore need to explicitly set the output
    directory by calling $DB2HTML with "-o html".
    
    Fix by Alexandre Rostovtsev <tetromino gentoo org>

 configure.ac              |    2 +-
 docs/tutorial/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c799346..da7325e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ dnl ************************************
 GTK_DOC_CHECK([1.8])
 
 AC_PATH_PROGS([DB2HTML], [db2html docbook2html])
-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+AM_CONDITIONAL(HAVE_DOCBOOK, [test -n "$DB2HTML"])
 
 dnl NOTE: We need to use a separate automake conditional for this
 dnl       to make this work with the tarballs.
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index 71d70be..3b1a424 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -6,7 +6,7 @@ html:
 if HAVE_DOCBOOK
 	if test -w $(srcdir); then \
 	  (cd $(srcdir); \
-	   $(DB2HTML) gmime-tut.sgml; \
+	   $(DB2HTML) -o html gmime-tut.sgml; \
 	   test -d html && rm -r html; \
 	   mv gmime-tut html); \
 	fi



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