remove -gtk2 suffix

svn path=/trunk/; revision=24785

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 24945537b865635ed7db71abda9175b217436718..370cc2d69de54a4e553fb537e7504e0cf7c22402 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -14,7 +14,7 @@ UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
 
 EXE=../../tshark.exe ../../editcap.exe \
 !IFDEF GTK2_DIR
-       ../../wireshark-gtk2.exe \
+       ../../wireshark.exe \
 !ENDIF
        ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe WinPcap_4_0_2.exe
 DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 212bbab4efe4347f326a576825e1dd8fe1a2efa5..2d7ed80d45e9b7a57212fc0353292b65be969de0 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -672,7 +672,7 @@ SectionGroup "!Wireshark" SecWiresharkGroup
 Section "Wireshark GTK2" SecWiresharkGTK2
 ;-------------------------------------------
 SetOutPath $INSTDIR
-File /oname=wireshark.exe "..\..\wireshark-gtk2.exe"
+File /oname=wireshark.exe "..\..\wireshark.exe"
 File "${GTK2_DIR}\bin\libgdk-win32-2.0-0.dll"
 File "${GTK2_DIR}\bin\libgdk_pixbuf-2.0-0.dll"
 File "${GTK2_DIR}\bin\libgtk-win32-2.0-0.dll"