From 950c7dc13e9e5be6b3cb8ead25c2650de21c2ef8 Mon Sep 17 00:00:00 2001
From: panne <unknown>
Date: Sat, 21 Aug 2004 13:48:59 +0000
Subject: [PATCH] [project @ 2004-08-21 13:48:58 by panne] If "hhc" is in the
 PATH, the "htmlhelp" target builds a *.chm file now. Note:
 This is untested and "hhc" should really be detected via
 autoconf.

---
 mk/suffix.mk |    6 +++++-
 mk/target.mk |   12 ++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mk/suffix.mk b/mk/suffix.mk
index fb95830..59be7bd 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -264,10 +264,14 @@ endif
 	$(RM) -rf $(dir $@)
 	$(XSLTPROC) --stringparam base.dir $(dir $@) \
 		    --stringparam manifest.in.base.dir 1 \
-		    --stringparam htmlhelp.chm $(basename $<).chm \
+		    --stringparam htmlhelp.chm "..\\"$(basename $<).chm \
 		    $(XSLTPROC_OPTS) \
 		    $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
 
+# TODO: Detect hhc via autoconf
+%.chm : %-htmlhelp/index.html
+	( cd $(dir $<) && hhc htmlhelp.hhp )
+
 %.fo : %.xml
 	$(XSLTPROC) --output $@ \
 		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
diff --git a/mk/target.mk b/mk/target.mk
index f4aaa11..625d581 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -811,23 +811,19 @@ install-docs:: $(INSTALL_DOCS)
 endif
 endif
 
-# The following could be an entry for an Obfuscated Makefile Contest...
+# TODO: The following could be an entry for an Obfuscated Makefile Contest...
 ifneq "$(INSTALL_XML_DOC)" ""
 ifneq "$(XMLDocWays)" ""
-install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.htmlhelp,%-htmlhelp/index.html,$(patsubst %.html,%-html/index.html,.$(i)))))
+install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.htmlhelp,%.chm,$(patsubst %.html,%-html/index.html,.$(i)))))
 	@$(INSTALL_DIR) $(datadir)	
 	@for i in $(XMLDocWays); do \
 		if [ $$i = "html" ]; then \
 			$(INSTALL_DIR) $(datadir)/html; \
 			echo "( cd $(INSTALL_XML_DOC)-html && $(CP) * $(datadir)/html )" ; \
 			( cd $(INSTALL_XML_DOC)-html && $(CP) * $(datadir)/html ) ; \
-		elif [ $$i = "htmlhelp" ]; then \
-			$(INSTALL_DIR) $(datadir)/htmlhelp; \
-			echo "( cd $(INSTALL_XML_DOC)-htmlhelp && $(CP) * $(datadir)/htmlhelp )" ; \
-			( cd $(INSTALL_XML_DOC)-htmlhelp && $(CP) * $(datadir)/htmlhelp ) ; \
 		else \
-			echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.html-no-chunks/.html/` $(datadir); \
-			$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.html-no-chunks/.html/` $(datadir); \
+			echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.htmlhelp/.chm/ | sed s/\.html-no-chunks/.html/` $(datadir); \
+			$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.htmlhelp/.chm/ | sed s/\.html-no-chunks/.html/` $(datadir); \
 		fi; \
 		if [ $$i = "html-no-chunks" ]; then \
 			echo $(CP) $(FPTOOLS_CSS_ABS) $(datadir); \
-- 
1.7.10.4