diff options
| author | Petr Sumbera <petr.sumbera@oracle.com> | 2016-11-22 06:09:24 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-11-25 14:34:49 +0000 |
| commit | 2e8bbe410e652d9038aa3be839602941f313ee25 (patch) | |
| tree | 1027810320c69b11153b4d097bea7d52cc8a572e /make-version.pl | |
| parent | cc09fbd2142607a43c2677f51e93095d0a7cb966 (diff) | |
| download | wireshark-2e8bbe410e652d9038aa3be839602941f313ee25.tar.gz | |
Fix git description for out-of-tree builds from a tarball
version.conf is to be found in the source dir after unpacking.
Bug: 13163
Change-Id: Ib8308e341b771d991ab48b48553f8d92b0b0621c
Reviewed-on: https://code.wireshark.org/review/18923
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/make-version.pl b/make-version.pl index 35a3d4143c..17ec2a86ed 100755 --- a/make-version.pl +++ b/make-version.pl @@ -689,9 +689,11 @@ sub get_config { } if (! open(FILE, "<$vconf_file")) { - print_diag "Version configuration file $vconf_file not " - . "found. Using defaults.\n"; - return 1; + if (! open(FILE, "<$srcdir/$vconf_file")) { + print_diag "Version configuration file $vconf_file not " + . "found. Using defaults.\n"; + return 1; + } } while (<FILE>) { |