ETHEREAL_LIBS -> WIRESHARK_LIBS

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18250 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index 9f5a6a1ad1d2b3c12ffe4eaf14f72f8f6b55c16f..b93c1047483d20c295531ecba9bf24f5321a176c 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -459,134 +459,134 @@ REQUIRED_TOOLS=\
 verify_tools:
        @$(SH) tools\win32-setup.sh --appverify $(REQUIRED_TOOLS)
 
-# Download and install all the required libraries into ETHEREAL_LIBS.
+# Download and install all the required libraries into WIRESHARK_LIBS.
 # If you used this setup target before, consider doing a clean_setup.
 setup: verify_tools
 !IF "$(GTK2_INST_VERSION)" == "2.8"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.8/glib-2.8.4-20051212.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.8/glib-dev-2.8.4-20051212.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.6/glib-2.6.6.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.6/glib-dev-2.6.6.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.4/glib-2.4.7.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.4/glib-dev-2.4.7.zip
 !ELSE
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib glib-2.2.3-20040116.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib glib-dev-2.2.3-20040116.zip
 !ENDIF
 !IFDEF GTK1_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk+ gtk+-1.3.0-20030717.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk+ gtk+-dev-1.3.0-20030115.zip
 !ENDIF
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gettext-runtime-0.13.1 gettext-runtime-0.13.1.zip
 !IFDEF NET_SNMP_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                . net-snmp-5.2.2.zip
 !ENDIF
 !IFDEF PCAP_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                . WpdPack_3_1.zip
 !ENDIF
 !IFDEF ADNS_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                . adns-1.0-win32-05.zip
 !ENDIF
 !IFDEF PCRE_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                pcre-6.4 pcre-6.4-bin.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                pcre-6.4 pcre-6.4-lib.zip
 !ENDIF
 !IFDEF ZLIB_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                zlib123-dll zlib123-dll.zip
 !ENDIF
 !IFDEF LUA_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                . lua5_1_vc6.zip
 !ENDIF
 !IFDEF GTK2_DIR
 !IF "$(GTK2_INST_VERSION)" == "2.8"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/gtk+-2.8.9.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/gtk+-dev-2.8.9.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/cairo-1.0.2.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/cairo-dev-1.0.2.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/atk-1.10.3.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/atk-dev-1.10.3.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/libpng-1.2.8-bin.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/gtk+-2.6.9.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/gtk+-dev-2.6.9.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/atk-1.9.0.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/atk-dev-1.9.0.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/gtk+-2.4.14.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/gtk+-dev-2.4.14.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/atk-1.6.0.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/atk-dev-1.6.0.zip
 !ELSE
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/gtk+-2.2.4-20040124.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/gtk+-dev-2.2.4-20040124.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/atk-1.4.0.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/atk-dev-1.4.0.zip
 !ENDIF
 !IF "$(PANGO_INST_VERSION)" == "1.10"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/pango-1.10.1.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/pango-dev-1.10.1.zip
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/pango-1.8.2.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.6/pango-dev-1.8.2.zip
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.4"
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/pango-1.4.1.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.4/pango-dev-1.4.1.zip
 !ELSE
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/pango-1.2.5-20040124.zip
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/pango-dev-1.2.5-20040124.zip
 !ENDIF
 !ENDIF
 !IFDEF GTK_WIMP_DIR
-       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk-wimp gtk-wimp/gtk-wimp-0.7.0-bin.zip
 !ENDIF
        @echo.
@@ -595,13 +595,13 @@ setup: verify_tools
 # Cleanup files installed by the setup target. It will not remove the 
 # downloaded zip files.
 clean_setup:
-    rm -r -f $(ETHEREAL_LIBS)/glib
-    rm -r -f $(ETHEREAL_LIBS)/gtk+
-    rm -r -f $(ETHEREAL_LIBS)/libiconv-1.9.1.bin.woe32
-    rm -r -f $(ETHEREAL_LIBS)/gettext-runtime-0.13.1
-    rm -r -f $(ETHEREAL_LIBS)/zlib123-dll
-    rm -r -f $(ETHEREAL_LIBS)/gtk2
-    rm -r -f $(ETHEREAL_LIBS)/gtk-wimp
+    rm -r -f $(WIRESHARK_LIBS)/glib
+    rm -r -f $(WIRESHARK_LIBS)/gtk+
+    rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
+    rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.13.1
+    rm -r -f $(WIRESHARK_LIBS)/zlib123-dll
+    rm -r -f $(WIRESHARK_LIBS)/gtk2
+    rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
 
 ################################################################################
 # Prepare the source tree for running (t)ethereal directly from there.

diff --git a/README.win32 b/README.win32
index b5542baf42afb1ee3b7cdaa64f503f2750e75af0..bd3ee6bb449b6c0ca1371f48ef67063262b65989 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -142,7 +142,7 @@ See section below for instructions.
 Automated library download
 --------------------------
 Before using the automated download, be sure to edit the config.nmake file 
-to suit your needs. Especially have a look at the ETHEREAL_LIBS setting.
+to suit your needs. Especially have a look at the WIRESHARK_LIBS setting.
 However, the defaults should be working well for a first start.
 
 If you've installed Microsoft Visual C++ (MSVC), you can run:
@@ -155,7 +155,7 @@ server location at:
 
        http://anonsvn.ethereal.com/ethereal-win32-libs/trunk/packages/
 
-and unpack it in the $ETHEREAL_LIBS directory. 
+and unpack it in the $WIRESHARK_LIBS directory. 
 
 If you have problems downloading the files, you might be connected to the 
 internet through a proxy/firewall. In this case see the wget documentation 
@@ -208,7 +208,7 @@ The optional zlib package for win32 is available at its homepage:
 
 By default, the build process looks for these packages in
 C:\ethereal-win32-libs.  You can place them in a different directory, but
-you must update the ETHEREAL_LIBS variable in config.nmake accordingly.
+you must update the WIRESHARK_LIBS variable in config.nmake accordingly.
 
 The following lists the packages needed to compile Ethereal and the default
 locations where to unpack them, when the above method isn't used.
@@ -233,7 +233,7 @@ and optional:
 (to use the default locations, the directories in question should be
 created, and each zip file should be unpacked into the corresponding
 directory).  If you only want to change the C:\ethereal-win32-libs
-part, you just change the setting of ETHEREAL_LIBS in config.nmake; if
+part, you just change the setting of WIRESHARK_LIBS in config.nmake; if
 you want to change subdirectories, you'll have to change the individual
 item for a package.  (Note that some zip files create the subdirectory -
 those zip files just have C:\ethereal-win32-libs in the list above - so

diff --git a/docbook/edg_src/EDG_chapter_libraries.xml b/docbook/edg_src/EDG_chapter_libraries.xml
index 460d90e92a9480a0642611d78f4ce26250f95273..367b9f457325e9ad2e6839198a185c09807c0038 100644 (file)
--- a/docbook/edg_src/EDG_chapter_libraries.xml
+++ b/docbook/edg_src/EDG_chapter_libraries.xml
@@ -110,7 +110,7 @@
        <filename>C:\ethereal-win32-libs</filename>.
        You can change this to any other location by editing the file
        <filename>config.nmake</filename> and changing the line containing 
-       the ETHEREAL_LIBS setting to your favourite place (use an absolute path 
+       the WIRESHARK_LIBS setting to your favourite place (use an absolute path 
        here).
        </para>
        <para>
@@ -125,7 +125,7 @@
        </para>
        <para>
        Then it will download the zipped libraries into the directory specified by 
-       ETHEREAL_LIBS and install (unzip) all required library files there.
+       WIRESHARK_LIBS and install (unzip) all required library files there.
        </para>
        <para>
        If you have problems downloading the library files, see the wget proxy 
@@ -139,7 +139,7 @@
        some new functionality, your libraries get outdated.
        </para>
        <para>
-       You could simply remove everything in the ETHEREAL_LIBS dir and call the 
+       You could simply remove everything in the WIRESHARK_LIBS dir and call the 
        setup target again, but that would require to download every file again 
        (currently about 33MB), which isn't necessary.
        </para>
@@ -157,7 +157,7 @@
        <listitem>
        <para>  
        Remove all files previously unzipped from the downloaded files in your 
-       ETHEREAL_LIBS library path (all the subdirs, e.g. 
+       WIRESHARK_LIBS library path (all the subdirs, e.g. 
        <filename>c:\ethereal_libs\gtk+</filename>), 
        except for the zip files located at the toplevel, which are the files 
        downloaded the last time(s). You could do this, be entering at the command line:
@@ -169,7 +169,7 @@
        <listitem>
        <para>
        Start the setup target described above. As wget will download only the 
-       missing files, existing zip files in the ETHEREAL_LIBS dir won't be 
+       missing files, existing zip files in the WIRESHARK_LIBS dir won't be 
        downloaded again. Remaining (outdated) zip files shouldn't do any harm.
        </para>
        </listitem>