diff options
| author | Ron <ron@debian.org> | 2013-07-13 11:53:04 +0400 |
|---|---|---|
| committer | Ron <ron@debian.org> | 2013-07-13 11:53:04 +0400 |
| commit | cfe8e2b86d778da6c3d4521ae6f3bd46311399d8 (patch) | |
| tree | 71052cb37fb1bcc0d9778131f21b836e0acbcb55 /configure.ac | |
| parent | ae521b0fe56edb19dacad72851eb996f2b2d5ae9 (diff) | |
Always try to update the version when autogen.sh is run
This avoids at least one case where ./autogen.sh && ./configure && make
will re-run configure because the makefile rules updated something that
it depends upon. Pulling a new version from git will change the version
so we should update that at the first step rather than iterating after
the last one.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 3881cb4d..2d4896bd 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,8 @@ dnl The package_version file will be automatically synced to the git revision dnl by the update_version script when configured in the repository, but will dnl remain constant in tarball releases unless it is manually edited. m4_define([CURRENT_VERSION], - m4_esyscmd([ if test -e package_version || ./update_version; then + m4_esyscmd([ ./update_version 2>/dev/null || true + if test -e package_version; then . ./package_version printf "$PACKAGE_VERSION" else |