Description: html file generation from sgml
 Build install.tgz documentation when DOCBOOK_DSL is defined, as advertised by
 the comments.
 Clean up unused html/dist/man targets
 new clean-local target to remove tmp & html files

Author: Jean-Michel Vourgère <jmv_deb@nirgal.com>
Forwarded: yes
Last-Update: 2012-01-16
Applied-Upstream: 0.7, commit:939d7206e2472dba7959c77ebc37d05aaad7b5b1,
                       commit:4d1ec966584c85c2b9b2ff78b1e1a1f91658fd53

Index: mdbtools/doc/Makefile.am
===================================================================
--- mdbtools.orig/doc/Makefile.am
+++ mdbtools/doc/Makefile.am
@@ -1,36 +1,33 @@
-# Converting DocBook to HTML (several small files)
-# http://www.freebsd.org/tutorials/docproj-primer/x3132.html#AEN3140
 SHELL = /bin/sh
 TXT2MAN = txt2man
 PRODUCT = MDBTools
 
+# To make the userguide, export DOCBOOK_DSL TO point to docbook.dsl.
+
 dist_man_MANS	= mdb-tables.1 mdb-ver.1 mdb-export.1 mdb-schema.1 mdb-sql.1 \
 	mdb-array.1 mdb-header.1 mdb-hexdump.1 mdb-parsecsv.1 mdb-prop.1 gmdb2.1
-DISTCLEANFILES = ${dist_man_MANS}
-EXTRA_DIST	= mdb-tables.txt mdb-ver.txt mdb-export.txt mdb-schema.txt mdb-sql.txt faq.html txt2man install.sgml
+if ENABLE_DOCBOOK
+  dist_man_MANS += install.tgz
+endif
+CLEANFILES = ${dist_man_MANS} install install.tgz
+EXTRA_DIST	= mdb-tables.txt mdb-ver.txt mdb-export.txt mdb-schema.txt mdb-sql.txt \
+	mdb-array.txt mdb-header.txt mdb-hexdump.txt mdb-parsecsv.txt mdb-prop.txt gmdb2.txt \
+	faq.html install.sgml
 
-html:	install.tgz
-
-dist:	install.tgz man 
-#dist:	man 
-
-# To make the userguide, export DOCBOOK_DSL TO point to docbook.dsl.
+.txt.1:
+	- $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(VERSION) -s 1 $(srcdir)/$< > $@
 
+# Converting DocBook to HTML (several small files)
+# http://www.freebsd.org/tutorials/docproj-primer/x3132.html#AEN3140
 install.tgz: $(srcdir)/install.sgml
-	if test -n "${DOCBOOK_DSL}"; then \
-	        rm -rf html && \
-	        mkdir html && \
-	        cd html && pwd && \
-	        openjade -d ${DOCBOOK_DSL} -t sgml ../$(srcdir)/install.sgml; \
-	        test -f book1.htm && \
-	        ln -s book1.htm index.html && cd .. && \
-	        if ! [ -L userguide ]; then \
-	                ln -s html install; \
-	        fi; \
-	        tar zcf install.tgz install/* \
-	; fi
+	rm -rf html
+	mkdir html
+	cd html && \
+	    openjade -d ${DOCBOOK_DSL} -t sgml ../install.sgml
+	[ -f html/book1.htm ]
+	ln -s book1.htm html/index.html
+	[ -L install ] || ln -s html install
+	tar zcf install.tgz install/*
 
-man:	mdb-tables.1 mdb-ver.1 mdb-export.1 mdb-sql.1
-
-.txt.1:
-	- $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(VERSION) -s 1 $(srcdir)/$< > $@
+clean-local:
+	-rm -rf html
Index: mdbtools/configure.in
===================================================================
--- mdbtools.orig/configure.in
+++ mdbtools/configure.in
@@ -181,6 +181,8 @@
 
 AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
 
+AM_CONDITIONAL(ENABLE_DOCBOOK, test -n "$DOCBOOK_DSL")
+
 dnl Checks for library functions.
 VL_LIB_READLINE
 
