From 07ad3cce072c279bb860246fdaa3471b599e22ef Mon Sep 17 00:00:00 2001
From: Ulf Lamping <ulf.lamping@web.de>
Date: Thu, 22 Nov 2007 09:04:32 +0000
Subject: [PATCH] don't install the *.exe.manifest and *.dll.manifest files.
 The manifest is embedded in the exe/dll files, so no need to install them
 seperately.

svn path=/trunk/; revision=23544
---
 packaging/nsis/wireshark.nsi      | 3 +--
 packaging/u3/win32/makefile.nmake | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index be2a4c3269..f9a711e478 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -689,8 +689,6 @@ SectionIn 1 RO
 !endif
 SetOutPath $INSTDIR
 File /oname=wireshark.exe "..\..\wireshark-gtk2.exe"
-IfFileExists $INSTDIR\wireshark-gtk2.exe.manifest 0 +2
-Rename $INSTDIR\wireshark-gtk2.exe.manifest $INSTDIR\wireshark.exe.manifest
 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"
@@ -979,6 +977,7 @@ Delete "$INSTDIR\*.dll"
 Delete "$INSTDIR\*.html"
 Delete "$INSTDIR\COPYING"
 Delete "$INSTDIR\AUTHORS-SHORT"
+; previous versions installed these files
 Delete "$INSTDIR\*.manifest"
 ; previous versions installed this file
 Delete "$INSTDIR\AUTHORS-SHORT-FORMAT"
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index 041da15152..834f5d2908 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -242,10 +242,8 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs  manifest.u3i u3util
 # these files are copied onto the U3 host and are required to make Wireshark stable
 #
 	$(COPY) $(TOPDIR)\wiretap\wiretap-$(WTAP_VERSION).dll $(HOST) $(COPY_FLAGS)
-	if exist $(TOPDIR)\wiretap\wiretap-$(WTAP_VERSION).dll.manifest $(COPY) $(TOPDIR)\wiretap\wiretap-$(WTAP_VERSION).dll.manifest $(HOST) $(COPY_FLAGS)
 !IFDEF ENABLE_LIBWIRESHARK
 	$(COPY) $(TOPDIR)\epan\libwireshark.dll $(HOST) $(COPY_FLAGS)
-	if exist $(TOPDIR)\epan\libwireshark.dll.manifest $(COPY) $(TOPDIR)\epan\libwireshark.dll.manifest $(HOST) /d
 !ENDIF
 	$(COPY) $(GLIB_DIR)\bin\libglib-2.0-0.dll $(HOST) $(COPY_FLAGS)
 	$(COPY) $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(HOST) $(COPY_FLAGS)
@@ -284,9 +282,7 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs  manifest.u3i u3util
 	$(COPY) $(TOPDIR)\wireshark-gtk2.exe $(HOST) $(COPY_FLAGS)
 # can't get /i to work with $(COPY) above to do the rename there
 	mv $(HOST)\wireshark-gtk2.exe $(HOST)\wireshark.exe
-	if exist $(TOPDIR)\wireshark-gtk2.exe.manifest $(COPY) $(TOPDIR)\wireshark-gtk2.exe.manifest $(HOST) $(COPY_FLAGS)
 # can't get /i to work with $(COPY) above to do the rename there
-	if exist $(HOST)\wireshark-gtk2.exe.manifest mv $(HOST)\wireshark-gtk2.exe.manifest $(HOST)\wireshark.exe.manifest
 	$(COPY) $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll $(HOST) $(COPY_FLAGS)
 	$(COPY) $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll $(HOST) $(COPY_FLAGS)
 	$(COPY) $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll $(HOST) $(COPY_FLAGS)