Couple of small updates for CHM build

diff --git a/Makefile.in b/Makefile.in
index f5a96bf7ba0b3deca2448b7b8c6bda1a987a0178..dba995785f77bb344ad561ba5ea1c6270be652cb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,7 @@ EPSTOPDF = @EPSTOPDF@
 MANPAGEDIR = manpages
 HOWTODIR = howto
 GUIDEDOC = guide
-DEVDOCDIR = /devel
+DEVDOCDIR = devel
 MAKEINDEX = @MAKEINDEX@
 IMAGEPROJDIR = $(HOWTODIR)/imagefiles
 IMAGEGUIDEDIR = $(GUIDEDOC)/images
@@ -114,6 +114,8 @@ html-single: $(HTMLDIR) $(HTMLDIR)/samba.css $(HTMLDIR)/Samba-HOWTO-Collection.h
 
 html: $(HTMLDIR)/howto $(HTMLDIR)/guide $(HTMLDIR)/devel $(HTMLDIR)/index.html
 
+htmlhelp: $(HTMLHELPDIR)/Samba-HOWTO-Collection $(HTMLHELPDIR)/Samba-Developers-Guide $(HTMLHELPDIR)/Samba-Guide
+
 $(HTMLDIR)/index.html: htmldocs.html $(HTMLDIR)
        cp $< $@
        
@@ -221,12 +223,24 @@ $(FODIR):
 $(FODIR)/%.fo: %.xml $(FODIR)
        $(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
 
+# HTML Help
+
 $(HTMLHELPDIR):
        mkdir $(HTMLHELPDIR)
 
-$(HTMLHELPDIR)/%: %.xml $(HTMLHELPDIR) 
+$(HTMLHELPDIR)/Samba-HOWTO-Collection/images: 
+       -mkdir -p $@
+       cp -p $(HOWTODIR_IMAGES_PNG) $@
+
+$(HTMLHELPDIR)/Samba-Guide/images:
+       -mkdir -p $@
+       cp -p $(GUIDEDOC_IMAGES_PNG) $@
+
+$(HTMLHELPDIR)/Samba-Developers-Guide/images:
+
+$(HTMLHELPDIR)/%: %.xml $(HTMLHELPDIR) $(HTMLHELPDIR)/%/images
        -mkdir $@
-       $(XSLTPROC) --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
+       $(XSLTPROC) --stringparam htmlhelp.chm $(patsubst %.xml,%.chm,$<) --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
 
 # Single large HTML files
 

diff --git a/README b/README
index 3aa1090388fd612067dd9195b4ecc01b90098667..7a31a868c265f668931b04668872db19892fba86 100644 (file)
--- a/README
+++ b/README
@@ -97,3 +97,7 @@ Add the following two lines to /etc/xml/catalog for db2latex:
 
 catalog entries for the other DTD's and XSL scripts should be present on your 
 system already.
+
+Windows Help files
+----------
+http://htmlhelp.berlios.de/howto/mshh4wine.php

diff --git a/configure.in b/configure.in
index b5de164dff6709cbac548ac65555f45fb6018fc8..75ea1532fc1ba3843536841c5be3ba3cb3202383 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,7 @@ DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex])
 DOCS_DEFINE_TARGET(PDF, LATEX, [PDF versions], [pdf])
 DOCS_DEFINE_TARGET(PS, LATEX, [PostScript versions], [ps])
 DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
+DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp])
 DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman])
 DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages])
 DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])