X-Git-Url: http://cgit.sxemacs.org/?p=sxemacs;a=blobdiff_plain;f=autogen.sh;h=b31eb5099cc5f125f48162072a8f83efb132b1e6;hp=a3690c1598694f73e02f94c841d799c29d8e557c;hb=1b6e2638f91b3a7a1f30f2791b5434dff7931747;hpb=a17da6cfe6279dbd4ad4a1ba618f862edb2da6fc

diff --git a/autogen.sh b/autogen.sh
index a3690c1..b31eb50 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Configure script bootstrap for SXEmacs
 #
-# Copyright (C) 2005, 2006, 2007 Steve Youngs.
+# Copyright (C) 2005 - 2012 Steve Youngs.
 # Copyright (C) 2006, 2007, 2008 Sebastian Freundt.
 # Copyright (C) 2007, 2010, 2011 Nelson Ferreira
 
@@ -36,7 +36,8 @@ fi
 
 # To cater for Solaris
 if test -d "/usr/xpg4/bin"; then
-    PATH=/usr/xpg4/bin:$PATH
+    # don't add xpg4 dir to PATH if on OpenIndiana
+    grep -q OpenIndiana /etc/release 2>/dev/null||PATH=/usr/xpg4/bin:$PATH
     export PATH
 fi
 
@@ -45,20 +46,27 @@ olddir=$(pwd)
 srcdir=$(dirname $0)
 cd "$srcdir"
 
-EXPECTED_TREE_VERSION="22.1.14"
+EXPECTED_TREE_VERSION="22.1.15"
 
 emacs_is_beta=t
 if test -n "$GIT" -a -n "$($GIT symbolic-ref HEAD 2>/dev/null)"; then
 	TREE_VERSION="$($GIT tag|tail -n1|tr -d v)"
 	GIT_VERSION="$($GIT describe | head -n1)"
+	GIT_BRANCH="$(git branch --no-color | awk '/^\*/ { print $2 }')"
 	IN_GIT="1"
 fi
 if test -z "$TREE_VERSION"; then
 	TREE_VERSION="$EXPECTED_TREE_VERSION"
 	if test -n "$IN_GIT"; then
-	    echo "If you cloned this branch into your own you should issue:"
+	    echo "If you cloned this branch into your own you could issue:"
 	    echo "\tgit tag -s v${TREE_VERSION}.<your branch_name>"
-	    echo "\tgit push --tag"
+	    echo ""
+	    echo "Be careful about pushing the tags as they probably will be "
+	    echo "more of a nuisance..."
+	    echo ""
+	    TREE_VERSION="$EXPECTED_TREE_VERSION.$GIT_BRANCH"
+	    echo "For now I am assuming the tre version will be $TREE_VERSION"
+	    echo ""
 	fi
 fi
 if test -z "$GIT_VERSION"; then
@@ -69,7 +77,7 @@ emacs_major_version="$(echo $TREE_VERSION|cut -d. -f1)"
 emacs_minor_version="$(echo $TREE_VERSION|cut -d. -f2)"
 emacs_beta_version="$(echo $TREE_VERSION|cut -d. -f3)"
 emacs_full_version="$emacs_major_version.$emacs_minor_version.$emacs_beta_version"
-sxemacs_codename="Geo"
+sxemacs_codename="Goggomobil"
 sxemacs_git_version="$GIT_VERSION"
 
 if test "$emacs_full_version" != "$EXPECTED_TREE_VERSION"; then