diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2008-04-05 01:22:53 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2008-04-05 01:22:53 +0000 |
| commit | 73c84a7d7be2237e9ee836c3d54fc70478aab338 (patch) | |
| tree | 356f39c7c5d9c292ab55cc8808338143ece388bf /packaging | |
| parent | deb0feb3438fc9177494e75e2186524effa12773 (diff) | |
remove more GTK1 stuff from the Win32 build process (incomplete)
svn path=/trunk/; revision=24780
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 15 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index f0078b1a36..24945537b8 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -11,16 +11,6 @@ include ../../config.nmake UNIX2DOS=$(PERL) ../../tools/unix2dos.pl -!IFDEF GTK2_ONLY -# define installer name and undefine GTK1_DIR to get a separate -# installer for Wireshark GTK2 version -DEST=wireshark-gtk2 -!ENDIF - -!IFNDEF DEST -# define installer name for combined GTK1 and GTK2 installer package -DEST=wireshark -!ENDIF EXE=../../tshark.exe ../../editcap.exe \ !IFDEF GTK2_DIR @@ -89,7 +79,7 @@ NSI=wireshark.nsi \ DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS) -all: NEWS.txt $(DEST)-setup-$(VERSION).exe +all: NEWS.txt wireshark-setup-$(VERSION).exe NEWS.txt: ../../NEWS $(UNIX2DOS) < ../../NEWS > NEWS.txt @@ -99,9 +89,8 @@ 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 -$(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake +wireshark-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake $(MAKENSIS) \ - /DDEST=$(DEST) \ /DMSVC_VARIANT=$(MSVC_VARIANT) \ !IFDEF MSVCR_DLL /DMSVCR_DLL="$(MSVCR_DLL)" \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 34a44df209..212bbab4ef 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -30,7 +30,7 @@ InstType "un.All (remove all)" Name "${PROGRAM_NAME} ${VERSION}" ; The file to write -OutFile "${DEST}-setup-${VERSION}.exe" +OutFile "wireshark-setup-${VERSION}.exe" ; Icon of installer and uninstaller Icon "..\..\image\wireshark.ico" |