summaryrefslogtreecommitdiff
path: root/packaging/u3
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2007-01-30 01:26:56 +0000
committerUlf Lamping <ulf.lamping@web.de>2007-01-30 01:26:56 +0000
commiteed4a86d997b4abeec578ecf7ae84b501342185a (patch)
tree27888d97967444e31d0620012d3f2fef0e6a094d /packaging/u3
parent518b8fb965166591c1b346192e2a0589c56efcb0 (diff)
downloadwireshark-eed4a86d997b4abeec578ecf7ae84b501342185a.tar.gz
if wireshark-gtk2.exe.manifest doesn't exist, don't try to copy it - hopefully fixes the buildbot...
svn path=/trunk/; revision=20618
Diffstat (limited to 'packaging/u3')
-rw-r--r--packaging/u3/win32/makefile.nmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index cb22f8811f..6315accad0 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -258,7 +258,7 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util
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
- mv $(HOST)\wireshark-gtk2.exe.manifest $(HOST)\wireshark.exe.manifest
+ 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)