diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-06-13 23:04:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-06-13 23:04:57 +0000 |
| commit | f6e2b64a8f276e7c24ae24788bae837f144313ed (patch) | |
| tree | db82c6fc61ea2de96524ebe58334e01d90c10d55 /packaging | |
| parent | b5e5d6ac35c92780c939e657c686c5a8b247d053 (diff) | |
| download | wireshark-f6e2b64a8f276e7c24ae24788bae837f144313ed.tar.gz wireshark-f6e2b64a8f276e7c24ae24788bae837f144313ed.tar.bz2 wireshark-f6e2b64a8f276e7c24ae24788bae837f144313ed.zip | |
Fix things to match what we're doing in our portableapps counterpart.
svn path=/trunk/; revision=43246
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/u3/win32/Makefile.nmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/u3/win32/Makefile.nmake b/packaging/u3/win32/Makefile.nmake index 56caecb320..b17424d7a1 100644 --- a/packaging/u3/win32/Makefile.nmake +++ b/packaging/u3/win32/Makefile.nmake @@ -59,10 +59,12 @@ nsis-bits: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm cd ../u3/win32 -distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl +$(WSMANIFEST): cd ../.. $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest cd u3/win32 + +distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl $(PERL) makenmake.pl $(WSMANIFEST) > $@ distribution: u3-dirs manifest.u3i u3util.exe nsis-bits wireshark.bat distribution.nmake |