From 2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Tue, 20 Nov 2007 20:28:04 +0000
Subject: simplify source tree version even more

Signed-off-by: Michael Krelin <hacker@klever.net>
---
(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 58afeb3..1ea8de9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,8 @@ 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"
--
cgit v0.9.0.2