[ohm] ohm: Branch 'master'

[Rob Taylor]

 docs/Makefile.am |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
diff-tree 437a86a4b18a2be033225432fd099bcb7f0c3114 (from b5f76d26d2e94f9279b03b56aaf20038cd853cdd)
Author: Rob Taylor <rob.taylor at codethink.co.uk>
Date:   Tue Sep 4 14:46:48 2007 +0100

    don't try to distribute index.html if we can't build it.
    
    Makes dist and install of index.html dependant on docbook-doc being enabled.

diff --git a/docs/Makefile.am b/docs/Makefile.am
index c3d3800..0b6cca2 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -21,15 +21,6 @@ SPEC_XML_FILES =			\
 SPEC_HTML_FILES =			\
 	index.html
 
-htmldocdir = $(docdir)
-htmldoc_DATA = index.html
-
-if DOCBOOK_DOCS_ENABLED
-
-index.html : introduction.xml
-	$(XMLTO) html-nochunks -m config.xsl index.xml
-endif # DOCBOOK_DOCS_ENABLED
-
 clean-local:
 	rm -f *~
 	rm -f *.html
@@ -39,5 +30,16 @@ EXTRA_DIST = 				\
 	config.xsl			\
 	docbook.css			\
 	$(SPEC_XML_FILES)		\
-	$(IMAGE_FILES)			\
-	$(SPEC_HTML_FILES)
+	$(IMAGE_FILES)
+
+if DOCBOOK_DOCS_ENABLED
+
+htmldocdir = $(docdir)
+htmldoc_DATA = index.html
+
+index.html : introduction.xml
+	$(XMLTO) html-nochunks -m config.xsl index.xml
+
+EXTRA_DIST += $(SPEC_HTML_FILES)
+
+endif #DOCBOOK_DOCS_ENABLED