Simplify the test in a loop.

[obnox/wireshark/wip.git] / make-version.pl

diff --git a/make-version.pl b/make-version.pl
index d5589dc6b496ded2f78e7d19275ef90bcbf96698..f59ba21495118e5431ff3e6865108884e5c6a8f2 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -72,15 +72,16 @@ my %version_pref = (
        "format"     => "SVN %Y%m%d%H%M%S",
 
        # Normal development builds
-       #"pkg_enable" => 1,
-       #"pkg_format" => "-SVN-%#",
+       "pkg_enable" => 1,
+       "pkg_format" => "-SVN-%#",
 
        # Development releases
-       "pkg_enable" => 0,
-       "pkg_format" => "",
+       #"pkg_enable" => 0,
+       #"pkg_format" => "",
        );
 my $srcdir = ".";
 
+$ENV{LANG} = "C";  # Ensure we run with correct locale
 
 # Run "svn info".  Parse out the most recent modification time and the
 # revision number.
@@ -253,11 +254,12 @@ sub print_svn_version
                        $revision . "\"\n" .
                        "#define SVNPATH \"" . $repo_path . "\"\n";
        } else {
-               $svn_version = "/* #define SVNVERSION \"\" */\n" .
-                       "/* #define SVNPATH \"\" */\n";
+               $svn_version = "#define SVNVERSION \"SVN Rev Unknown\"\n" .
+                       "#define SVNPATH \"unknown\"\n";
        }
        if (open(OLDVER, "<$version_file")) {
-               if (<OLDVER> eq $svn_version) {
+               my $old_svn_version = <OLDVER> . <OLDVER>;
+               if ($old_svn_version eq $svn_version) {
                        $needs_update = 0;
                }
                close OLDVER;