aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/portableapps/win32/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-06-13 22:28:28 +0000
committerGerald Combs <gerald@wireshark.org>2012-06-13 22:28:28 +0000
commitb5e5d6ac35c92780c939e657c686c5a8b247d053 (patch)
tree3a09900445497333844d625b301d37cccc751b5c /packaging/portableapps/win32/Makefile.nmake
parentb9debc4467a447e66ba6a3a31af434be001361a8 (diff)
Don't add uninstall.exe to the U3/PortableApps manifest. Define
STAGING_DIR. Update some makefile dependencies. svn path=/trunk/; revision=43244
Diffstat (limited to 'packaging/portableapps/win32/Makefile.nmake')
-rw-r--r--packaging/portableapps/win32/Makefile.nmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake
index de90f8e157..ec4063cdba 100644
--- a/packaging/portableapps/win32/Makefile.nmake
+++ b/packaging/portableapps/win32/Makefile.nmake
@@ -54,7 +54,7 @@ $(WSMANIFEST):
$(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest
cd portableapps/win32
-distribution.nmake: $(WSMANIFEST) makenmake.pl
+distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl
$(PERL) makenmake.pl $(WSMANIFEST) > $@
distribution: distribution.nmake