Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake

use WIRESHARK_LIB_DIR for the location of our external libraries.


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

5 files changed, 158 insertions, 158 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index d9ba2b21e5..4ad5eeebd2 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -29,7 +29,7 @@ WIN_SETUP=tools/$(WIRESHARK_TARGET_PLATFORM)-setup.sh
 #      as to the required library package files will be made.
 #
 LIBS_CHECK=_libs_check_
-!IF [$(SH) $(WIN_SETUP) --checktag "$(WIRESHARK_LIBS)"] != 0
+!IF [$(SH) $(WIN_SETUP) --checktag "$(WIRESHARK_LIB_DIR)"] != 0
 CHECK_TAG=_check_tag_
 !ELSE
 CHECK_TAG=
@@ -589,7 +589,7 @@ image::
 #
 $(ADNS_DLL):
 !IF "$(MSVC_VARIANT)" == "MSVC6"
-	if not exist $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns
+	if not exist $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns
 	copy $(ADNS_DIR)\adns_win32\lib\adns_dll.dll $(ADNS_DLL)
 	copy $(ADNS_DIR)\adns_win32\lib\adns_dll.lib $(ADNS_LIBS)
 !ELSE
@@ -603,7 +603,7 @@ $(ADNS_DLL):
 !IFDEF MANIFEST_INFO_REQUIRED
 	mt.exe -nologo -manifest "adns_dll.dll.manifest" -outputresource:adns_dll.dll;2
 !ENDIF
-	if not exist $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns
+	if not exist $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns
 	copy adns_dll.dll $(ADNS_DLL)
 	copy adns_dll.lib $(ADNS_LIBS)
 	cd ..\..\..
@@ -727,7 +727,7 @@ REQUIRED_TOOLS=\
 
 verify_tools:
 # As win-setup.sh assumes the dir exists create it if it doesn't
-	@if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
+	@if not exist $(WIRESHARK_LIB_DIR) md $(WIRESHARK_LIB_DIR)
 	@$(SH) $(WIN_SETUP) --appverify $(REQUIRED_TOOLS)
 
 # Targets and etc used to verify or download libraries
@@ -765,7 +765,7 @@ $(CHECK_TAG): _FORCE_
 
 !ENDIF
 
-# Download (if needed) and install all the required libraries into WIRESHARK_LIBS.
+# Download (if needed) and install all the required libraries into WIRESHARK_LIB_DIR.
 # A clean_setup is done first to ensure that the target dirs don't
 # contain old files remaining from a previous setup run.
 setup: verify_tools clean_setup process_libs
@@ -774,35 +774,35 @@ setup: verify_tools clean_setup process_libs
 # The process_libs target when invoked causes either a --libverify or a --download for all the required libraries.
 # (The choice is determined by the value of the macro WIN_SETUP_OPT).
 process_libs:
-    @if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
+    @if not exist $(WIRESHARK_LIB_DIR) md $(WIRESHARK_LIB_DIR)
 !IFDEF GTK_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
 !ENDIF
 !IFDEF KFW_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. kfw-3-2-2-i386-ws-vc6.zip
-#	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+#	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 #		. kfw-3-2-2.zip
 !ENDIF
 !IFDEF PCAP_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. WpdPack_$(PCAP_VERSION).zip
 !ENDIF
 !IFDEF AIRPCAP_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		AirPcap_Devpack_4_1_0_1622 AirPcap_Devpack_4_1_0_1622.zip
 !ENDIF
 !IFDEF C_ARES_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF ADNS_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. adns-1.0-win32-05ws.zip
 !ENDIF
 !IFDEF ZLIB_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
 		zlib125 zlib-1.2.5.zip
 !else
@@ -810,40 +810,40 @@ process_libs:
 !endif
 !ENDIF
 !IFDEF LUA_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		lua5.1.4 lua$(LUA_DIST)_lib.zip
 !ENDIF
 
 !IFDEF GNUTLS_PKG
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF PORTAUDIO_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. portaudio_v19_2.zip
 !ENDIF
 !IFDEF SMI_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF GEOIP_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. GeoIP-1.4.6-$(WIRESHARK_TARGET_PLATFORM)ws.zip
 !ENDIF
 !IFDEF HHC_DIR
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		user-guide user-guide-37310.zip
 !ENDIF
 !IFDEF UPX
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. upx303w.zip
 !ENDIF
 !IFDEF NASM
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. nasm-2.09.08-win32.zip
 !ENDIF
 !IF "$(WIN_SETUP_OPT)" == "--download"
-	@$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIBS)"
+	@$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)"
 !ENDIF
 	@echo.
 	@echo Wireshark is ready to build.
@@ -853,7 +853,7 @@ process_libs:
 # WHEN UPDATING LIBRARY VERSIONS, KEEP ALSO ONE FORMER VERSION SO
 # UPDATING REMOVES THE FORMER USER DIRS
 clean_setup:
-    cd $(WIRESHARK_LIBS)
+    cd $(WIRESHARK_LIB_DIR)
     rm -r -f adns-1.0-win32-05ws
     rm -r -f c-ares-1.5.3ws
     rm -r -f c-ares-1.6.0ws
diff --git a/config.nmake b/config.nmake
index 2feaccad58..d25249e5ca 100644
--- a/config.nmake
+++ b/config.nmake
@@ -36,8 +36,8 @@ WTAP_VERSION_MICRO=0
 # compile the sources. This setting is used only inside this file.
 # This can be defined in the system environment.
 #
-!IFNDEF WIRESHARK_LIBS
-WIRESHARK_LIBS=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
+!IFNDEF WIRESHARK_LIB_DIR
+WIRESHARK_LIB_DIR=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
 !ENDIF
 
 #
@@ -145,7 +145,7 @@ MSVC_VARIANT=MSVC2008
 # If you don't have NASM, comment this line out, so that NASM
 # isn't defined.
 #
-NASM=$(WIRESHARK_LIBS)\nasm-2.09.08\nasm.exe
+NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe
 
 #
 # Optional: the Python library enables scripting support.
@@ -236,7 +236,7 @@ GLIB_VERSION=2.0
 # If you want building with GTK+, set GTK_DIR to the pathname of the
 # directory in which the "include" and "lib" directories reside.
 #
-GTK_DIR=$(WIRESHARK_LIBS)\gtk2
+GTK_DIR=$(WIRESHARK_LIB_DIR)\gtk2
 # These macros are used by the nsis installer script and by the install target.
 PNG_DLL=libpng14-14.dll
 FREETYPE_DLL=freetype6.dll
@@ -265,7 +265,7 @@ GTK_INST_VERSION=2.22
 # If you don't have the WPdpack, comment this line out, so that
 # PCAP_DIR isn't defined.
 #
-PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
 # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
 PCAP_VERSION=4_1_2
 
@@ -285,7 +285,7 @@ PCAP_REMOTE=1
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
 # EXperimental only use zlib 1.2.5 on win32 for now
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
@@ -299,7 +299,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
 #
 # If C_ARES_DIR is defined below, it will override this setting.
 #
-#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+#ADNS_DIR=$(WIRESHARK_LIB_DIR)\adns-1.0-win32-05ws
 
 #
 # Optional: the c-ares library enables asynchronous (nonblocking) DNS
@@ -337,7 +337,7 @@ GNUTLS_PKG=2.10.3-1.11
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
+KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6
 
 #
 # Optional: the Nettle library enables ??? decryption.
@@ -348,7 +348,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
 # If you don't have Nettle, comment this line out, so that NETTLE_DIR
 # isn't defined.
 #
-# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
+# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10
 
 #
 # Optional: the LUA library enables scripting support.
@@ -360,7 +360,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
 # isn't defined.
 #
 LUA_DIST=5_1_4_Win32_dll6
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
+LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
 
 #
 # Optional: the PORTAUDIO library enables audio output for RTP streams.
@@ -371,8 +371,8 @@ LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
 # If you don't have PORTAUDIO, comment this line out, so that
 # PORTAUDIO_DIR isn't defined.
 #
-#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
-PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
+#PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v18_1
+PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v19_2
 
 #
 # Version number of PortAudio
@@ -390,7 +390,7 @@ PORTAUDIO_VERSION=19
 # If you don't have the AirPcap developer's pack, comment this line out,
 # so that AIRPCAP_DIR isn't defined.
 #
-AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
+AIRPCAP_DIR=$(WIRESHARK_LIB_DIR)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
 
 #
 # Optional: LIBSMI, System Management Interface
@@ -408,7 +408,7 @@ SMI_PKG=svn-40773
 # However, the Microsoft Platform SDK for Windows Server 2003 R2 provides
 # these definitions. The SDK's SetEnv.bat script defines INETSDK.
 !IF "$(MSVC_VARIANT)" != "MSVC6" || DEFINED(INETSDK)
-GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.6-win32ws\libGeoIP
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win32ws\libGeoIP
 !ENDIF
 
 !else
@@ -428,7 +428,7 @@ GLIB_VERSION=2.0
 # If you want building with GTK+, set GTK_DIR to the pathname of the
 # directory in which the "include" and "lib" directories reside.
 #
-GTK_DIR=$(WIRESHARK_LIBS)\gtk2
+GTK_DIR=$(WIRESHARK_LIB_DIR)\gtk2
 # These macros are used by the nsis installer script and by the install target.
 PNG_DLL=libpng14-14.dll
 #TIFF_DLL=libtiff-3.dll
@@ -460,7 +460,7 @@ GTK_INST_VERSION=2.22
 # If you don't have the WPdpack, comment this line out, so that
 # PCAP_DIR isn't defined.
 #
-PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
 # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
 PCAP_VERSION=4_1_2
 
@@ -480,7 +480,7 @@ PCAP_REMOTE=1
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
 #
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
@@ -494,7 +494,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
 #
 # If C_ARES_DIR is defined below, it will override this setting.
 #
-#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+#ADNS_DIR=$(WIRESHARK_LIB_DIR)\adns-1.0-win32-05ws
 
 #
 # Optional: the c-ares library enables asynchronous (nonblocking) DNS
@@ -532,7 +532,7 @@ GNUTLS_PKG=2.10.3-1.7
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-#KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
+#KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3.2.2-ws1
 
 #
 # Optional: the Nettle library enables ??? decryption.
@@ -543,7 +543,7 @@ GNUTLS_PKG=2.10.3-1.7
 # If you don't have Nettle, comment this line out, so that NETTLE_DIR
 # isn't defined.
 #
-# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
+# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10
 
 #
 # Optional: the LUA library enables scripting support.
@@ -555,7 +555,7 @@ GNUTLS_PKG=2.10.3-1.7
 # isn't defined.
 #
 LUA_DIST=5_1_4_Win64_dll9
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
+LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
 
 #
 # Optional: the PORTAUDIO library enables audio output for RTP streams.
@@ -566,8 +566,8 @@ LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
 # If you don't have PORTAUDIO, comment this line out, so that
 # PORTAUDIO_DIR isn't defined.
 #
-#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
-PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
+#PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v18_1
+PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v19_2
 
 #
 # Version number of PortAudio
@@ -585,7 +585,7 @@ PORTAUDIO_VERSION=19
 # If you don't have the AirPcap developer's pack, comment this line out,
 # so that AIRPCAP_DIR isn't defined.
 #
-AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
+AIRPCAP_DIR=$(WIRESHARK_LIB_DIR)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
 
 #
 # Optional: LIBSMI, System Management Interface
@@ -599,7 +599,7 @@ SMI_PKG=svn-40773
 #
 # Used to map IP addresses to MaxMind GeoIP database entries
 #
-GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.6-win64ws\libGeoIP
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win64ws\libGeoIP
 
 !endif
 
@@ -708,7 +708,7 @@ HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
 # comment this line out, so that UPX isn't defined.
 #
 
-UPX=$(WIRESHARK_LIBS)\upx303w\upx.exe
+UPX=$(WIRESHARK_LIB_DIR)\upx303w\upx.exe
 
 ##### Flags, PATHs and Miscellaneous #####
 
@@ -891,7 +891,7 @@ INSTALL_DIR=wireshark-gtk2
 !ELSEIF "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
 # We're not creating portable packages and therefore don't have to worry about
 # "deploying using xcopy"
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2002"
 # you probably need to tweak this directory if you don't use the professional edition!
@@ -913,7 +913,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(PROCESSOR_ARCHI
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
 # you need to download the redistributable package vcredist_x86.exe from Microsoft first,
 # and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
 MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.*
@@ -921,7 +921,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARC
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE"
 # you need to download the redistributable package vcredist_x86.exe from Microsoft first,
 # and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010"
 MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
 
@@ -1135,7 +1135,7 @@ ZLIB_CONFIG=
 
 !IFDEF C_ARES_PKG
 !UNDEF ADNS_DIR
-C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
+C_ARES_DIR=$(WIRESHARK_LIB_DIR)\c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
 C_ARES_CFLAGS=/I$(C_ARES_DIR)/include
 C_ARES_LIBS=$(C_ARES_DIR)\lib\libcares-2.lib
 C_ARES_DLL=$(C_ARES_DIR)\bin\libcares-2.dll
@@ -1148,8 +1148,8 @@ C_ARES_CONFIG=
 !IFDEF ADNS_DIR
 ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
 ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
-ADNS_LIBS=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.lib
-ADNS_DLL=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.dll
+ADNS_LIBS=$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns\adns_dll.lib
+ADNS_DLL=$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns\adns_dll.dll
 # Nmake uses carets to escape special characters
 ADNS_CONFIG=^#define HAVE_GNU_ADNS 1
 !else
@@ -1183,7 +1183,7 @@ NETTLE_CONFIG=
 !ENDIF
 
 !IFDEF GNUTLS_PKG
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
+GNUTLS_DIR=$(WIRESHARK_LIB_DIR)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
 GNUTLS_PATH=$(GNUTLS_DIR)
 # /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
 GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL
@@ -1255,7 +1255,7 @@ HHC_LIBS=
 !ENDIF
 
 !IFDEF SMI_PKG
-SMI_DIR=$(WIRESHARK_LIBS)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
+SMI_DIR=$(WIRESHARK_LIB_DIR)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
 SMI_CONFIG=^#define HAVE_LIBSMI 1
 SMI_CFLAGS=/I$(SMI_DIR)\include
 SMI_LIBS=$(SMI_DIR)\lib\libsmi-2.lib
diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.xml b/docbook/wsdg_src/WSDG_chapter_libraries.xml
index c7e2e87d94..c8cb11810b 100644
--- a/docbook/wsdg_src/WSDG_chapter_libraries.xml
+++ b/docbook/wsdg_src/WSDG_chapter_libraries.xml
@@ -3,7 +3,7 @@
 
 <chapter id="ChapterLibraries">
   <title>Library Reference</title>
-  
+
   <section id="ChLibIntro">
 	<title>Introduction</title>
 	<para>
@@ -31,7 +31,7 @@
 	<para>
 	Win32: All libraries for the VS9 generation are available at:
 	<ulink	url="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"/>,
-	but see <xref linkend="ChLibsSetup"/> for an easier way to install the 
+	but see <xref linkend="ChLibsSetup"/> for an easier way to install the
 	libraries.
 	</para>
 	</tip>
@@ -45,18 +45,18 @@
 	</tip>
 	</para>
   </section>
-	
+
   <section id="ChLibsFormat">
     <title>Binary library formats</title>
 	<para>
-	Binary libraries are available in different formats, depending on the C 
+	Binary libraries are available in different formats, depending on the C
 	compiler used to build it and of course the platform they were built for.
 	</para>
-	
+
 	<section id="ChLibsFormatUnix">
 	<title>Unix</title>
 	<para>
-	If you have installed unix binary libraries on your system, they will 
+	If you have installed unix binary libraries on your system, they will
 	match the C compiler. If not already installed, the libraries should be
 	available as a package from the platform installer, or you can download
 	and compile the source and then install the binaries.
@@ -74,40 +74,40 @@
 	<section id="ChLibsFormatWin32Cygwin">
 	<title>Win32: cygwin gcc</title>
 	<para>
-	Cygwin provides most of the required libraries (with file extension .a or .lib) 
+	Cygwin provides most of the required libraries (with file extension .a or .lib)
 	for Wireshark suitable for cygwin's gcc compiler.
 	</para>
 	</section>
   </section>
-	
+
   <section id="ChLibsSetup">
 	<title>Win32: Automated library download</title>
 	<section id="ChLibsSetupInitial">
 	<title>Initial download</title>
 
 	<para>
-	You can download/install all required libraries by using the setup target 
+	You can download/install all required libraries by using the setup target
 	of the <filename>Makefile.nmake</filename> from the source package.
 	</para>
 	<tip><title>Tip!</title>
 	<para>
-	It's a really good idea to use the Win32 automated library download to 
+	It's a really good idea to use the Win32 automated library download to
 	install the required libraries as it makes this download very easy.
 	</para>
 	</tip>
 	<note><title>Note!</title>
 	<para>
 	Before you start the download, you must have installed both
-	the required tools (see <xref linkend="ChapterTools"/>) and also the 
+	the required tools (see <xref linkend="ChapterTools"/>) and also the
 	Wireshark sources (see <xref linkend="ChSrcObtain"/>).
 	</para>
 	</note>
 	<para>
-	By default the libraries will be downloaded and installed into 
+	By default the libraries will be downloaded and installed into
 	<filename>C:\wireshark-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 WIRESHARK_LIBS setting to your favourite place (use an absolute path 
+	<filename>config.nmake</filename> and changing the line containing
+	the WIRESHARK_LIB_DIR setting to your favourite place (use an absolute path
 	here).
 	</para>
 	<para>
@@ -121,15 +121,15 @@
 	as described already in <xref linkend="ChToolsWin32Verify"/>.
 	</para>
 	<para>
-	Then it will download the zipped libraries (together around 30MB!) from 
-	the server location at: <ulink 
-	url="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"/> 
-	into the directory specified by WIRESHARK_LIBS and install (unzip) all 
+	Then it will download the zipped libraries (together around 30MB!) from
+	the server location at: <ulink
+	url="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"/>
+	into the directory specified by WIRESHARK_LIB_DIR and install (unzip) all
 	required library files there.
 	</para>
 	<para>
-	If you have problems downloading the library files, you might be connected 
-	to the internet through a proxy/firewall. 
+	If you have problems downloading the library files, you might be connected
+	to the internet through a proxy/firewall.
 	In this case see the wget proxy comment in <xref linkend="ChToolsWget"/>.
 	</para>
         </section>
@@ -140,8 +140,8 @@
 	some new functionality, your libraries get outdated.
 	</para>
 	<para>
-	You could simply remove everything in the WIRESHARK_LIBS dir and call the 
-	<userinput>setup</userinput> target again, but that would require a download of every file again, 
+	You could simply remove everything in the WIRESHARK_LIB_DIR dir and call the
+	<userinput>setup</userinput> target again, but that would require a download of every file again,
 	which isn't necessary.
 	</para>
 	<para>
@@ -150,8 +150,8 @@
 	<itemizedlist>
 	<listitem>
 	<para>
-	Update your Wireshark sources to the latest SVN files (see <xref 
-	linkend="ChSrcObtain"/>), so the zip filenames in the setup target 
+	Update your Wireshark sources to the latest SVN files (see <xref
+	linkend="ChSrcObtain"/>), so the zip filenames in the setup target
 	of Makefile.nmake are in sync with the library zip files on the server.
 	</para>
         </listitem>
@@ -162,41 +162,41 @@
           <para>
 	<prompt>&gt;</prompt> <userinput>nmake -f Makefile.nmake setup</userinput>
 	</para>
-	<para>	
+	<para>
 	Note that this command will automatically do a <userinput>clean-setup</userinput> which will
-        remove all files previously unzipped from the downloaded files in your 
-	WIRESHARK_LIBS library path (all the subdirs, e.g. 
-	<filename>c:\wireshark-win32-libs\gtk+</filename>), 
-	except for the zip files located at the toplevel, which are the files 
+        remove all files previously unzipped from the downloaded files in your
+	WIRESHARK_LIB_DIR library path (all the subdirs, e.g.
+	<filename>c:\wireshark-win32-libs\gtk+</filename>),
+	except for the zip files located at the toplevel, which are the files
 	downloaded the last time(s).
 	</para>
 	<para>
-	Also note that as wget will download only the 
-	missing (updated) files, existing zip files in the WIRESHARK_LIBS dir won't be 
+	Also note that as wget will download only the
+	missing (updated) files, existing zip files in the WIRESHARK_LIB_DIR dir won't be
 	downloaded again. Remaining (outdated) zip files shouldn't do any harm.
 	</para>
         </listitem>
 	</itemizedlist>
 	</section>
-	
+
   </section>
 
   <section id="ChLibsGtk">
 	<title>GTK+ / GLib / GDK / Pango / ATK / GNU gettext / GNU libiconv</title>
 	<para>
-	The Glib library is used as a basic platform abstraction library, it's 
-	not related to graphical user interface (GUI) things. For a detailed 
+	The Glib library is used as a basic platform abstraction library, it's
+	not related to graphical user interface (GUI) things. For a detailed
 	description about GLib, see <xref linkend="ChCodeGLib"/>.
 	</para>
 	<para>
-	The GTK and its dependent libraries are used to build Wireshark's GUI. 
-	For a detailed description of the GTK libraries, see <xref 
+	The GTK and its dependent libraries are used to build Wireshark's GUI.
+	For a detailed description of the GTK libraries, see <xref
 	linkend="ChUIGTK"/>.
 	</para>
 	<para>
-	All other libraries are dependent on the two libraries mentioned above, 
-	you will typically not come in touch with these while doing Wireshark 
-	development. 
+	All other libraries are dependent on the two libraries mentioned above,
+	you will typically not come in touch with these while doing Wireshark
+	development.
 	</para>
 	<para>
 	As the requirements for the GLib/GTK libraries have increased in the past,
@@ -207,12 +207,12 @@
 	<section id="ChLibsUnixGTK">
 	<title>Unix</title>
 	<para>
-	The GLib/GTK+ libraries are available for many unix-like platforms and 
+	The GLib/GTK+ libraries are available for many unix-like platforms and
 	cygwin.
 	</para>
 	<para>
-	If these libraries aren't already installed and also aren't available as a 
-	package for your platform, you can get them at: 
+	If these libraries aren't already installed and also aren't available as a
+	package for your platform, you can get them at:
 	<ulink url="http://www.gtk.org/download.html"/>.
 	</para>
 	</section>
@@ -220,23 +220,23 @@
 	<section id="ChLibsWin32GTK">
 	<title>Win32 MSVC</title>
 	<para>
-	You can get the latest version at: 
+	You can get the latest version at:
 	<ulink url="http://www.gtk.org/download.html"/>.
 	</para>
 	</section>
   </section>
-  
+
   <section id="ChLibsSMI">
 	<title>SMI (optional)</title>
 	<para>
 	"Various tools relating to the SMI MIB Information"
 	</para>
-	
+
 	<section id="ChLibsUnixSMI">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://www.ibr.cs.tu-bs.de/projects/libsmi/"/>.
 	</para>
 	</section>
@@ -244,15 +244,15 @@
 	<section id="ChLibsWin32SMI">
 	<title>Win32 MSVC</title>
 	<para>
-	Wireshark uses the source libSMI distribution at 
+	Wireshark uses the source libSMI distribution at
 	<ulink url="http://www.ibr.cs.tu-bs.de/projects/libsmi/"/>.
 	libSMI is compiled using MSVC++ 6.0. It's stored in the libsmi zip archive at
 	<ulink url="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"/>
 	</para>
 	</section>
-		
+
   </section>
-  
+
   <section id="ChLibsCares">
     <title>c-ares (optional)</title>
 	<para>
@@ -284,12 +284,12 @@
 	"Advanced, easy to use, asynchronous-capable DNS client library and
 utilities."
 	</para>
-	
+
 	<section id="ChLibsUnixADNS">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://www.gnu.org/software/adns/"/>.
 	</para>
 	</section>
@@ -297,13 +297,13 @@ utilities."
 	<section id="ChLibsWin32ADNS">
 	<title>Win32 MSVC</title>
 	<para>
-	You can get the latest version at: 
+	You can get the latest version at:
 	<ulink url="http://adns.jgaa.com/"/>
 	</para>
 	</section>
-	
+
   </section>
-  
+
 
   <section id="ChLibsPCRE">
 	<title>PCRE (optional)</title>
@@ -316,12 +316,12 @@ utilities."
 	wrapper around PCRE. Wireshark's configure script will use it instead of
 	PCRE if it is present.
 	</para>
-	
+
 	<section id="ChLibsUnixPCRE">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://www.pcre.org/"/>.
 	</para>
 	</section>
@@ -329,18 +329,18 @@ utilities."
 	<section id="ChLibsWin32PCRE">
 	<title>Win32 MSVC</title>
 	<para>
-	You can get the latest version at: 
+	You can get the latest version at:
 	<ulink url="http://gnuwin32.sourceforge.net/packages/pcre.htm"/>
 	</para>
 	</section>
-		
+
   </section>
-  
-  
+
+
   <section id="ChLibsZlib">
 	<title>zlib (optional)</title>
 	<para>
-	"zlib is designed to be a 
+	"zlib is designed to be a
 	<ulink url="http://www.gzip.org/zlib/zlib_license.html">free</ulink>,
 	general-purpose, legally unencumbered -- that is, not covered by any
 	patents -- lossless data-compression library for use on virtually any computer
@@ -350,8 +350,8 @@ utilities."
 	<section id="ChLibsUnixZlib">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://www.gzip.org/zlib/"/>.
 	</para>
 	</section>
@@ -359,7 +359,7 @@ utilities."
 	<section id="ChLibsWin32Zlib">
 	<title>Win32 MSVC</title>
 	<para>
-	You can get the latest version at: 
+	You can get the latest version at:
 	<ulink url="http://gnuwin32.sourceforge.net/packages/zlib.htm"/>
 	</para>
 	<para>
@@ -369,19 +369,19 @@ utilities."
 	</section>
 
   </section>
-  
-  
+
+
   <section id="ChLibsPcap">
 	<title>libpcap/WinPcap (optional)</title>
 	<para>
 	"packet capture library"
 	</para>
-	
+
 	<section id="ChLibsLibpcap">
 	<title>Unix: libpcap</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://www.tcpdump.org/"/>.
 	</para>
 	</section>
@@ -400,15 +400,15 @@ utilities."
   <section id="ChLibsGNUTLS">
 	<title>GnuTLS (optional)</title>
 	<para>
-	The "GNU Transport Layer Security Library" is used to dissect SSL and TLS 
+	The "GNU Transport Layer Security Library" is used to dissect SSL and TLS
 	protocols (aka: HTTPS).
 	</para>
-	
+
 	<section id="ChLibsUnixGNUTLS">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://www.gnu.org/software/gnutls/download.html"/>.
 	</para>
 	</section>
@@ -416,7 +416,7 @@ utilities."
 	<section id="ChLibsWin32GNUTLS">
 	<title>Win32 MSVC</title>
 	<para>
-	We roll our own version using: 
+	We roll our own version using:
 	<ulink url="http://josefsson.org/gnutls4win/"/>
 	</para>
 	</section>
@@ -426,15 +426,15 @@ utilities."
   <section id="ChLibsGcrypt">
 	<title>Gcrypt (optional)</title>
 	<para>
-	The "Gcrypt Library" is Low-level encryption library and provides 
+	The "Gcrypt Library" is Low-level encryption library and provides
 	support for many ciphers, such as DES, 3DES, AES, Blowfish, and others..
 	</para>
-	
+
 	<section id="ChLibsUnixGcrypt">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://directory.fsf.org/security/libgcrypt.html"/>.
 	</para>
 	</section>
@@ -451,15 +451,15 @@ utilities."
   <section id="ChLibsKerberos">
 	<title>Kerberos (optional)</title>
 	<para>
-	The Kerberos library is used to dissect Kerberos, sealed DCERPC and 
+	The Kerberos library is used to dissect Kerberos, sealed DCERPC and
 	secureLDAP protocols.
 	</para>
-	
+
 	<section id="ChLibsUnixKerberos">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://web.mit.edu/Kerberos/dist/"/>.
 	</para>
 	<para>
@@ -470,7 +470,7 @@ utilities."
 	<section id="ChLibsWin32Kerberos">
 	<title>Win32 MSVC</title>
 	<para>
-	You can get the latest version of KfW "Kerberos for Windows" at: 
+	You can get the latest version of KfW "Kerberos for Windows" at:
 	<ulink url="http://web.mit.edu/Kerberos/dist/"/>
 	</para>
 	</section>
@@ -482,12 +482,12 @@ utilities."
 	<para>
 	The LUA library is used to add scripting support to Wireshark.
 	</para>
-	
+
 	<section id="ChLibsUnixLua">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://www.lua.org/download.html"/>.
 	</para>
 	</section>
@@ -495,7 +495,7 @@ utilities."
 	<section id="ChLibsWin32Lua">
 	<title>Win32 MSVC</title>
 	<para>
-	You can get the latest version at: 
+	You can get the latest version at:
 	<ulink url="http://luaforge.net/frs/?group_id=110"/>
 	</para>
 	</section>
@@ -507,12 +507,12 @@ utilities."
 	<para>
 	The PortAudio library enables audio output for RTP streams.
 	</para>
-	
+
 	<section id="ChLibsUnixPortAudio">
 	<title>Unix</title>
 	<para>
-	If this library isn't already installed or available as a 
-	package for your platform, you can get it at: 
+	If this library isn't already installed or available as a
+	package for your platform, you can get it at:
 	<ulink url="http://www.portaudio.com/download.html"/>.
 	</para>
 	</section>
@@ -520,7 +520,7 @@ utilities."
 	<section id="ChLibsWin32PortAudio">
 	<title>Win32 MSVC</title>
 	<para>
-	You can get the latest version at: 
+	You can get the latest version at:
 	<ulink url="http://www.portaudio.com/download.html"/>
 	</para>
 	</section>
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index bc87353158..d005b1d9c9 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -83,13 +83,13 @@ all: _FORCE_
 # fetch the latest available user-guide.chm version
 user-guide.chm::
 	if exist ..\..\docbook\user-guide.chm xcopy ..\..\docbook\user-guide.chm . /Y /D
-	if exist $(WIRESHARK_LIBS)\user-guide\user-guide.chm xcopy $(WIRESHARK_LIBS)\user-guide\user-guide.chm . /Y /D
+	if exist $(WIRESHARK_LIB_DIR)\user-guide\user-guide.chm xcopy $(WIRESHARK_LIB_DIR)\user-guide\user-guide.chm . /Y /D
 
 wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake
 	$(MAKENSIS) \
 	/DWIRESHARK_TARGET_PLATFORM=$(WIRESHARK_TARGET_PLATFORM) \
 	/DMSVC_VARIANT=$(MSVC_VARIANT) \
-	/DWIRESHARK_LIBS=$(WIRESHARK_LIBS) \
+	/DWIRESHARK_LIB_DIR=$(WIRESHARK_LIB_DIR) \
 !IFDEF MSVCR_DLL
 	/DMSVCR_DLL="$(MSVCR_DLL)" \
 !ENDIF
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake
index 0bc838d20e..de90f8e157 100644
--- a/packaging/portableapps/win32/Makefile.nmake
+++ b/packaging/portableapps/win32/Makefile.nmake
@@ -16,7 +16,7 @@ SOURCE		= WiresharkPortableSource
 WSMANIFEST	= ../../wireshark.manifest
 
 NSIS_PLUGINS	= nsis-plugins
-FINDPROCDLL	= $(WIRESHARK_LIBS)\$(NSIS_PLUGINS)\FindProcDLL.dll
+FINDPROCDLL	= $(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)\FindProcDLL.dll
 
 TOPDIR		= ..\..\..
 U3DIST		= ..\..\u3\win32
@@ -97,7 +97,7 @@ source:  WiresharkPortable.ini
 
 findprocdll:
 	if not exist $(FINDPROCDLL) \
-	@$(SH) ../../../tools/win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+	@$(SH) ../../../tools/win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		$(NSIS_PLUGINS) FindProc.zip
 
 
@@ -105,14 +105,14 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/
 	$(MAKENSIS) \
 	/DVERSION=$(PAPPS_VERSION) \
 	/DWSVERSION=$(VERSION) \
-	/DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \
+	/DEXTRA_PLUGINS="$(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)" \
 	Installer.nsi
 
 Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll
 	$(MAKENSIS) \
 	/DVERSION=$(PAPPS_VERSION) \
 	/DWSVERSION=$(VERSION) \
-	/DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \
+	/DEXTRA_PLUGINS="$(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)" \
 	/DDEFAULTWINPCAP=WinPcap_$(PCAP_VERSION).exe \
 	/DDEFAULTMSVCREDIST=vcredist_$(TARGET_MACHINE).exe \
 	WiresharkPortable.nsi