Merge pull request #129 from wiiaboo/pkgconfig-fixes

Only use version prefix in kvazaar binary
This commit is contained in:
Ari Koivula 2016-03-09 21:57:19 +02:00
commit c4fe5da270
2 changed files with 2 additions and 2 deletions

View file

@ -182,7 +182,7 @@ typedef int16_t coeff_t;
// NOTE: When making a release, check to see if incrementing libversion in
// configure.ac is necessary.
#ifndef KVZ_VERSION
#define KVZ_VERSION v0.8.3
#define KVZ_VERSION 0.8.3
#endif
#define VERSION_STRING QUOTE_EXPAND(KVZ_VERSION)

View file

@ -6,7 +6,7 @@ cd ..
if type git >/dev/null 2>/dev/null && [ -d .git ]; then
version="$(git describe --dirty --tags --match 'v*')"
else
version="$(awk '/#define KVZ_VERSION/ { print $3 }' src/global.h)"
version="v$(awk '/#define KVZ_VERSION/ { print $3 }' src/global.h)"
fi
printf '%s\n' "$version"