diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-08-14 17:54:35 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-08-14 17:54:35 +0000 |
| commit | 837f0d9d53c58900b679be0b65c1f2432d2fb23c (patch) | |
| tree | 8cb6dba3ca4aa961571bd0be9325834641f72366 /packaging/nsis/Makefile.nmake | |
| parent | f7e0b6490a6f2b56012aa98adc4c6ace5a126bb3 (diff) | |
SecFileExtensions was removed in 2005. Don't reference it. Fixes bug 2793.
Replicate the old SecFileExtensions behavior by disabling and unchecking
the file extensions option when Wireshark is unselected.
While we're at it, add a "PLATFORM" variable to config.nmake, and use
it to set the library directory and installer filename and title.
Add a couple of minor fixes.
svn path=/trunk/; revision=26019
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 6c3233e1bb..6755c8142a 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -82,7 +82,7 @@ NSI=wireshark.nsi \ DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS) -all: NEWS.txt wireshark-setup-$(VERSION).exe +all: NEWS.txt wireshark-$(PLATFORM)-$(VERSION).exe NEWS.txt: ../../NEWS $(UNIX2DOS) < ../../NEWS > NEWS.txt @@ -92,8 +92,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-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake +wireshark-$(PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake $(MAKENSIS) \ + /DPLATFORM=$(PLATFORM) \ /DMSVC_VARIANT=$(MSVC_VARIANT) \ !IFDEF MSVCR_DLL /DMSVCR_DLL="$(MSVCR_DLL)" \ @@ -162,14 +163,12 @@ wireshark-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile. wireshark.nsi clean: - rm -f wireshark-setup-$(VERSION).exe - rm -f wireshark-gtk2-setup-$(VERSION).exe + rm -f wireshark-$(PLATFORM)-$(VERSION).exe rm -f NEWS.txt rm -f user-guide.chm distclean: clean - rm -f wireshark-setup-*.exe - rm -f wireshark-gtk2-setup-*.exe + rm -f wireshark-$(PLATFORM)-*.exe maintainer-clean: distclean |