equal
deleted
inserted
replaced
1 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12901 |
1 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13163 |
2 |
2 |
3 --- make-version.pl |
3 --- make-version.pl |
4 +++ make-version.pl |
4 +++ make-version.pl |
5 @@ -619,7 +619,7 @@ |
5 @@ -689,9 +689,11 @@ |
6 { |
6 } |
7 my $VCS_REVISION; |
|
8 my $needs_update = 1; |
|
9 - my $set_header = 1; |
|
10 + my $set_header = 0; |
|
11 my $git_cdir; |
|
12 |
7 |
13 chomp($git_cdir = qx{git --git-dir="$srcdir/.git" rev-parse --git-common-dir 2> $devnull}); |
8 if (! open(FILE, "<$vconf_file")) { |
|
9 - print_diag "Version configuration file $vconf_file not " |
|
10 - . "found. Using defaults.\n"; |
|
11 - return 1; |
|
12 + if (! open(FILE, "<$srcdir/$vconf_file")) { |
|
13 + print_diag "Version configuration file $vconf_file not " |
|
14 + . "found. Using defaults.\n"; |
|
15 + return 1; |
|
16 + } |
|
17 } |
|
18 |
|
19 while (<FILE>) { |