From Harald Welte:

[obnox/wireshark/wip.git] / docbook / Makefile.nmake

diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake
index 72ed930fb34b2f18ce0a2f0832fe01041c883f2f..6ad30831f6b16f5ac402fcee30677aa086f74d20 100644 (file)
--- a/docbook/Makefile.nmake
+++ b/docbook/Makefile.nmake
@@ -26,7 +26,7 @@ RELEASE_NOTES_SOURCE = $(RELEASE_NOTES_SOURCE) Makefile.nmake
 
 # On every build, record the working copy revision string
 #   in svn_version.xml (if the svn version has changed).
-# This is done during nmake "preprocessing" so that it's done *before* 
+# This is done during nmake "preprocessing" so that it's done *before*
 #  nmake gets the date/time of the dependency file(s)].
 !IF [$(SH) ./check_svn_version.sh]
 !ENDIF
@@ -115,7 +115,7 @@ user-guide.chm: $(WSUG_SOURCE) wsluarm
        if not exist wsug_chm\wsug_graphics\toolbar md wsug_chm\wsug_graphics\toolbar
        -cp wsug_graphics/*.* wsug_chm/wsug_graphics/
        -cp wsug_graphics/toolbar/* wsug_chm/wsug_graphics/toolbar/
-       $(XSLTPROC) --stringparam base.dir wsug_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1  --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl user-guide.xml 
+       $(XSLTPROC) --stringparam base.dir wsug_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1  --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl user-guide.xml
        -$(HHC_EXE) htmlhelp.hhp
        -mv htmlhelp.chm $@
        -rm -r htmlhelp.hhp
@@ -129,7 +129,7 @@ user-guide.zip:
 !endif
 
 wsluarm: make-wsluarm.pl $(WSLUA_MODULES)
-       mkdir wsluarm_src
+       if not exist wsluarm_src md wsluarm_src
        $(PERL) make-wsluarm.pl $(WSLUA_MODULES)
        touch wsluarm
 
@@ -149,7 +149,9 @@ developer-guide.html: wsdg_html/developer-guide.html
 wsdg_html/developer-guide.html: $(WSDG_SOURCE)
        @ echo --- WSDG - HTML SINGLE PAGE ---
        if not exist wsdg_html\wsdg_graphics md wsdg_html\wsdg_graphics
-       cp wsdg_graphics/* wsdg_html/wsdg_graphics
+       if not exist wsdg_html\wsdg_graphics\toolbar md wsdg_html\wsdg_graphics\toolbar
+       cp wsdg_graphics/*.* wsdg_html/wsdg_graphics/
+       cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar/
        cp ws.css wsdg_html
        $(XSLTPROC) --stringparam base.dir wsdg_html/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl developer-guide.xml > $@
        -chmod -R og+rX wsdg_html
@@ -160,7 +162,9 @@ wsdg_html_chunked: wsdg_html_chunked/index.html
 wsdg_html_chunked/index.html: $(WSDG_SOURCE)
        @ echo --- WSDG - HTML CHUNKED ---
        if not exist wsdg_html_chunked\wsdg_graphics md wsdg_html_chunked\wsdg_graphics
-       cp wsdg_graphics/* wsdg_html_chunked/wsdg_graphics
+       if not exist wsdg_html_chunked\wsdg_graphics\toolbar md wsdg_html_chunked\wsdg_graphics\toolbar
+       cp wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics/
+       cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar/
        cp ws.css wsdg_html_chunked
        $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl developer-guide.xml
        -chmod -R og+rX wsdg_html_chunked
@@ -186,7 +190,9 @@ developer-guide.chm: $(WSDG_SOURCE)
 !ifdef HHC_EXE
        @ echo --- WSDG - MICROSOFT HTML HELP ---
        if not exist wsdg_chm\wsdg_graphics md wsdg_chm\wsdg_graphics
-       cp wsdg_graphics/* wsdg_chm/wsdg_graphics
+       if not exist wsdg_chm\wsdg_graphics\toolbar md wsdg_chm\wsdg_graphics\toolbar
+       cp wsdg_graphics/*.* wsdg_chm/wsdg_graphics/
+       cp wsdg_graphics/toolbar/* wsdg_chm/wsdg_graphics/toolbar/
        $(XSLTPROC) --stringparam base.dir wsdg_chm/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl developer-guide.xml
        -$(HHC_EXE) htmlhelp.hhp
        -mv htmlhelp.chm $@
@@ -243,4 +249,3 @@ release-notes.chm: $(RELEASE_NOTES_SOURCE)
        -rm -r htmlhelp.hhp
        -rm -r toc.hhc
 !endif
-