diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-07-19 18:22:46 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-07-19 18:22:46 +0000 |
| commit | 1f497af628d7bac84bd94fff6a4332f477017336 (patch) | |
| tree | 7a123f381666843c2b0c9e50ef9b8bbe36edccb3 /packaging | |
| parent | fd42af21275a9f2ed4df391c8e58bf8a3138be51 (diff) | |
Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
use WIRESHARK_LIB_DIR for the location of our external libraries.
svn path=/trunk/; revision=38119
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 4 | ||||
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 8 |
2 files changed, 6 insertions, 6 deletions
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 |