aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2008-04-05 08:23:37 +0000
committerUlf Lamping <ulf.lamping@web.de>2008-04-05 08:23:37 +0000
commit5ffcbc7faaecee06d368475381e7e025414aa6c2 (patch)
tree17bff306d5c72f174aed657fd5c82577ac1cc6a1 /packaging
parentbb8af7419fa83f69dec65be8c996ce325e54737f (diff)
remove -gtk2 suffix
svn path=/trunk/; revision=24785
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake2
-rw-r--r--packaging/nsis/wireshark.nsi2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 24945537b8..370cc2d69d 100644
--- 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 212bbab4ef..2d7ed80d45 100644
--- 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"