diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-09-16 00:21:21 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-09-16 00:21:21 +0000 |
| commit | 8526fa4086891942706a84c953c0425638e36852 (patch) | |
| tree | d9df3ab2429fae9cdcc2efb2dece6045ddcd246d | |
| parent | 657ee65b0fd878adb2f8ceccd327e90a80fec4a0 (diff) | |
| download | wireshark-8526fa4086891942706a84c953c0425638e36852.tar.gz wireshark-8526fa4086891942706a84c953c0425638e36852.tar.bz2 wireshark-8526fa4086891942706a84c953c0425638e36852.zip | |
wsdg_graphics/toolbar is a directory; fix the rules that weren't already
fixed to cope with that.
svn path=/trunk/; revision=39021
| -rw-r--r-- | docbook/Makefile.am | 10 | ||||
| -rw-r--r-- | docbook/Makefile.nmake | 12 |
2 files changed, 15 insertions, 7 deletions
diff --git a/docbook/Makefile.am b/docbook/Makefile.am index 8d5534208c..996f60db93 100644 --- a/docbook/Makefile.am +++ b/docbook/Makefile.am @@ -161,8 +161,9 @@ developer-guide.html: wsdg_html/developer-guide.html wsdg_html/developer-guide.html: $(WSDG_SOURCE) @ echo --- WSDG - HTML SINGLE PAGE --- - mkdir -p wsdg_html/wsdg_graphics - cp $(srcdir)/wsdg_graphics/* wsdg_html/wsdg_graphics + mkdir -p wsdg_html/wsdg_graphics/toolbar + cp $(srcdir)/wsdg_graphics/*.* wsdg_html/wsdg_graphics + cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar/ cp $(srcdir)/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/ \ @@ -176,8 +177,9 @@ wsdg_html_chunked: wsdg_html_chunked/index.html wsdg_html_chunked/index.html: $(WSDG_SOURCE) @ echo --- WSDG - HTML CHUNKED --- - mkdir -p wsdg_html_chunked/wsdg_graphics - cp $(srcdir)/wsdg_graphics/* wsdg_html_chunked/wsdg_graphics + mkdir -p wsdg_html_chunked/wsdg_graphics/toolbar + cp $(srcdir)/wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics + cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar/ cp $(srcdir)/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/ \ diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index 72ed930fb3..d830444c58 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -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 wsug_html\wsug_graphics\toolbar md wsug_html\wsug_graphics\toolbar + cp wsug_graphics/*.* wsug_html/wsug_graphics/ + cp wsug_graphics/toolbar/* wsug_html/wsug_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 wsug_html_chunked\wsug_graphics\toolbar md wsug_html_chunked\wsug_graphics\toolbar + cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics/ + cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_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 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 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 $@ |