summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-06-14 21:25:16 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:45:54 -0500
commit1dfd737ad53f2a42e12aebd9a3beba3e54f1341d (patch)
tree6a8d2957a546d8c509745c860ec4b539ad661032
parentcce465adf3417b190e7a3886d44b5bf46cec3563 (diff)
downloadsamba-1dfd737ad53f2a42e12aebd9a3beba3e54f1341d.tar.gz
samba-1dfd737ad53f2a42e12aebd9a3beba3e54f1341d.tar.bz2
samba-1dfd737ad53f2a42e12aebd9a3beba3e54f1341d.zip
Couple of small updates for CHM build
(This used to be commit b6e68ddbd367cfc48d6e4a70446109a210019f1f)
-rw-r--r--docs/Makefile.in20
-rw-r--r--docs/README4
-rw-r--r--docs/configure.in1
3 files changed, 22 insertions, 3 deletions
diff --git a/docs/Makefile.in b/docs/Makefile.in
index f5a96bf7ba..dba995785f 100644
--- a/docs/Makefile.in
+++ b/docs/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/docs/README b/docs/README
index 3aa1090388..7a31a868c2 100644
--- a/docs/README
+++ b/docs/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/docs/configure.in b/docs/configure.in
index b5de164dff..75ea1532fc 100644
--- a/docs/configure.in
+++ b/docs/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])