diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-06-13 22:28:28 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-06-13 22:28:28 +0000 |
| commit | b5e5d6ac35c92780c939e657c686c5a8b247d053 (patch) | |
| tree | 3a09900445497333844d625b301d37cccc751b5c /packaging/ws-manifest.pl | |
| parent | b9debc4467a447e66ba6a3a31af434be001361a8 (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/ws-manifest.pl')
| -rwxr-xr-x | packaging/ws-manifest.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl index 2c5c216cbc..98af01b99d 100755 --- a/packaging/ws-manifest.pl +++ b/packaging/ws-manifest.pl @@ -43,6 +43,8 @@ while ($line = <>) { if(scalar(@defines) == 0) { undef @defines; } + } elsif ($line =~/^File.*uninstall/) { + next; } elsif ($line =~ /^File[^\"]+\"([^\"]+)\"/) { $file = $1; # make things relative to the root rather than the NSIS directory |