diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-11-22 09:04:32 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-11-22 09:04:32 +0000 |
| commit | 07ad3cce072c279bb860246fdaa3471b599e22ef (patch) | |
| tree | 15f4ed75605953f20034041a00a33a8d6bd39c97 /packaging/u3 | |
| parent | 33c1bf50bfd3eb136fc74e344e9cd5ce00c5d848 (diff) | |
| download | wireshark-07ad3cce072c279bb860246fdaa3471b599e22ef.tar.gz | |
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
Diffstat (limited to 'packaging/u3')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 4 |
1 files changed, 0 insertions, 4 deletions
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) |