s/wsug_/wsdg_/g in the Developer's Guide targets.

svn path=/trunk/; revision=39199

diff --git a/docbook/Makefile.am b/docbook/Makefile.am
index 996f60db9333560423e254bf842b015b3f2d06e8..9241c91f0e001df3d26f24adf9b5930b2ad380ac 100644 (file)
--- a/docbook/Makefile.am
+++ b/docbook/Makefile.am
@@ -70,7 +70,7 @@ svn_version.xml: svn_version_check
 
 # Wireshark User Guide
 if HAVE_FOP
-WSUG_TARGETS=wsug.validated wsug_html_chunked user-guide.html user-guide-a4.pdf user-guide-us.pdf 
+WSUG_TARGETS=wsug.validated wsug_html_chunked user-guide.html user-guide-a4.pdf user-guide-us.pdf
 else
 WSUG_TARGETS=wsug.validated wsug_html_chunked user-guide.html
 endif
@@ -163,7 +163,7 @@ wsdg_html/developer-guide.html: $(WSDG_SOURCE)
        @ echo --- WSDG - HTML SINGLE PAGE ---
        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 wsdg_graphaphics/toolbar/* wsug_html/wsdg_graphaphics/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/ \
@@ -179,7 +179,7 @@ wsdg_html_chunked/index.html: $(WSDG_SOURCE)
        @ echo --- WSDG - HTML CHUNKED ---
        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 wsdg_graphaphics/toolbar/* wsug_html_chunked/wsdg_graphaphics/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/  \
@@ -231,7 +231,7 @@ release-notes.txt: $(RELEASE_NOTES_SOURCE)
                    --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< | $(HTML2TXT) > $@
 
 news: release-notes.txt
-       cp release-notes.txt ../NEWS 
+       cp release-notes.txt ../NEWS
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper
 # you will get lot's of errors, but that's ok
@@ -258,8 +258,7 @@ EXTRA_DIST = \
        make-wsluarm.pl         \
        README.txt              \
        Makefile.nmake          \
-       CMakeLists.txt  
+       CMakeLists.txt
 
 MAINTAINERCLEANFILES = \
        Makefile.in
-

diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake
index d830444c58b996f71c48cac14ded89611e2ae40e..1f613da845619f51484107a917239803fbf0e1e9 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
@@ -149,9 +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
-       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/
+       if not exist wsdg_html\wsdg_graphics\toolbar md wsdg_html\wsdg_graphics\toolbar
+       cp wsdg_graphics/*.* wsdg_html/wsdg_graphhics/
+       cp wsdg_graphhics/toolbar/* wsdg_html/wsdg_graphhics/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
@@ -162,9 +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
-       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/
+       if not exist wsdg_html_chunked\wsdg_graphhics\toolbar md wsdg_html_chunked\wsdg_graphhics\toolbar
+       cp wsdg_graphhics/*.* wsdg_html_chunked/wsdg_graphhics/
+       cp wsdg_graphhics/toolbar/* wsdg_html_chunked/wsdg_graphhics/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
@@ -190,9 +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
-       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/
+       if not exist wsdg_chm\wsdg_graphaphics\toolbar md wsdg_chm\wsdg_graphaphics\toolbar
+       cp wsdg_graphaphics/*.* wsdg_chm/wsdg_graphaphics/
+       cp wsdg_graphaphics/toolbar/* wsdg_chm/wsdg_graphaphics/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 $@
@@ -249,4 +249,3 @@ release-notes.chm: $(RELEASE_NOTES_SOURCE)
        -rm -r htmlhelp.hhp
        -rm -r toc.hhc
 !endif
-