diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-03-11 18:23:02 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-03-11 18:23:02 +0000 |
| commit | a0afeb9ccee0b8a20e77a3a6832b0824818f4384 (patch) | |
| tree | 8e0324366b892edcf3cf987f8d9b9fe7a71c5871 /packaging | |
| parent | 0d446ae826ff8d8ff827d770726aecf8dd187b15 (diff) | |
| download | wireshark-a0afeb9ccee0b8a20e77a3a6832b0824818f4384.tar.gz | |
Convert more PLATFORMs to WIRESHARK_TARGET_PLATFORM.
svn path=/trunk/; revision=27702
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 10 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index f130201770..4628bd8015 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -68,7 +68,7 @@ NSI=wireshark.nsi \ DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS) -all: NEWS.txt wireshark-$(PLATFORM)-$(VERSION).exe +all: NEWS.txt wireshark-$(WIRESHRK_TARGET_PLATFORM)-$(VERSION).exe NEWS.txt: ../../NEWS $(UNIX2DOS) < ../../NEWS > NEWS.txt @@ -78,9 +78,9 @@ 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 -wireshark-$(PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake +wireshark-$(WIRESHRK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake $(MAKENSIS) \ - /DPLATFORM=$(PLATFORM) \ + /DWIRESHRK_TARGET_PLATFORM=$(WIRESHRK_TARGET_PLATFORM) \ /DMSVC_VARIANT=$(MSVC_VARIANT) \ !IFDEF MSVCR_DLL /DMSVCR_DLL="$(MSVCR_DLL)" \ @@ -149,12 +149,12 @@ wireshark-$(PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Mak wireshark.nsi clean: - rm -f wireshark-$(PLATFORM)-$(VERSION).exe + rm -f wireshark-$(WIRESHRK_TARGET_PLATFORM)-$(VERSION).exe rm -f NEWS.txt rm -f user-guide.chm distclean: clean - rm -f wireshark-$(PLATFORM)-*.exe + rm -f wireshark-$(WIRESHRK_TARGET_PLATFORM)-*.exe maintainer-clean: distclean diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 401b4dd448..50f7f2c4a5 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -26,7 +26,7 @@ InstType "un.All (remove all)" ; ============================================================================ ; The name of the installer !define PROGRAM_NAME "Wireshark" -!if ${PLATFORM} == "win32" +!if ${WIRESHRK_TARGET_PLATFORM} == "win32" !define BITS 32 !else !define BITS 64 @@ -35,7 +35,7 @@ InstType "un.All (remove all)" Name "${PROGRAM_NAME} ${VERSION} (${BITS}-bit)" ; The file to write -OutFile "wireshark-${PLATFORM}-${VERSION}.exe" +OutFile "wireshark-${WIRESHRK_TARGET_PLATFORM}-${VERSION}.exe" ; Icon of installer and uninstaller Icon "..\..\image\wiresharkinst.ico" |