From 21125cf2cb0dc5f80f9f796fe4c222c36ba2fcc4 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 18 Dec 2010 19:53:32 -0500 Subject: Made the version generator code work right when we are on a tag because git describe just gives the tag name and nothing else. --- Config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Config') diff --git a/Config b/Config index fa35b2d43..4ccc82c62 100755 --- a/Config +++ b/Config @@ -168,11 +168,11 @@ if [ ! "$NO_INTRO" ] ; then VERSION=`git describe --tags` VERSION_BUILD=`echo "$VERSION" | cut -d'-' -f2` VERSION_EXTRA=`echo "$VERSION" | cut -d'-' -f3` - if [ "$VERSION_BUILD" == "$VERSION_EXTRA" ] ; then - VERSION_EXTRA="" + # Only do this if we are not on a tag, src/version.sh will be all we need then. + if [ "$VERSION_BUILD" != "$VERSION_EXTRA" ] ; then + echo "#define VERSION_BUILD $VERSION_BUILD" > include/version.h + echo "#define VERSION_EXTRA \"$VERSION_EXTRA\"" >> include/version.h fi - echo "#define VERSION_BUILD $VERSION_BUILD" > include/version.h - echo "#define VERSION_EXTRA \"$VERSION_EXTRA\"" >> include/version.h fi cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | $PAGER echo "" -- cgit