| author | Michael Krelin <hacker@klever.net> | 2007-11-20 20:28:04 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-11-20 20:28:04 (UTC) |
| commit | 2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b (patch) (side-by-side diff) | |
| tree | b41caa692cec461472f7e416b5d37a16b385adb2 | |
| parent | 287a35beef7c318a8eb38ad7753f681f4e57aa6a (diff) | |
| download | libopkele-2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b.zip libopkele-2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b.tar.gz libopkele-2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b.tar.bz2 | |
simplify source tree version even more
Signed-off-by: Michael Krelin <hacker@klever.net>
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 58afeb3..1ea8de9 100644 --- a/configure.ac +++ b/configure.ac @@ -13,13 +13,14 @@ AC_HEADER_STDC AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) AC_MSG_CHECKING([for source tree version]) if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" - test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" + test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ + -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" else PACKAGE_SRC_VERSION="$PACKAGE_VERSION" fi AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) AC_SUBST([PACKAGE_SRC_VERSION]) |