diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-06-23 21:07:37 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-06-23 21:07:37 +0000 |
| commit | d5de78acd1f0357d4d27ac0b2f70d9fcd1437055 (patch) | |
| tree | 9e83e7c02e5b545cd5d76fa9658c82740143222e /make-version.pl | |
| parent | 11848b9efe23535e5434033a81f0d4447aad7aa5 (diff) | |
Copy over r25535 from /trunk-1.0: When we're run with -p, set
VERSION_BUILD no matter what.
svn path=/trunk/; revision=25552
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make-version.pl b/make-version.pl index d851a52854..b21f99fc36 100755 --- a/make-version.pl +++ b/make-version.pl @@ -190,12 +190,13 @@ sub update_config_nmake my $line; my $contents = ""; my $version = ""; + my $update_ve = 0; - return if ($package_string eq ""); + if ($package_string eq "") { $update_ve = 1; }; open(CFGIN, "< config.nmake") || die "Can't read config.nmake!"; while ($line = <CFGIN>) { - if ($line =~ /^VERSION_EXTRA=/) { + if ($update_ve && $line =~ /^VERSION_EXTRA=/) { $line = "VERSION_EXTRA=$package_string\n"; } if ($line =~ /^VERSION_BUILD=/ && int($revision) > 0) { |