Changes in configure [1cef55f:09bd226]

File:

• configure (modified) (2 diffs)

configure

@@ -79 +79 @@
                 branch=$(cd $srcdir; git rev-parse --abbrev-ref HEAD)
 
-                search='\(.*\)-\([0-9]*\)-\(g[0-9a-f]*\)'
+                search="(.+)-([0-9]+)-(g[0-9a-f]+)"
                 replace="\1+$timestamp+$branch+\2-\3-git"
 
-                describe=$(cd $srcdir; git describe --long --tags 2>/dev/null)
-                if [ $? -ne 0 ]; then
-                        describe=${REAL_BITLBEE_VERSION}-0-g$(cd $srcdir; git rev-parse --short HEAD)
-                fi
-
-                BITLBEE_VERSION=$(echo $describe | sed "s#$search#$replace#")
-
-                unset timestamp branch search replace describe
+                BITLBEE_VERSION=$(cd $srcdir; git describe --long --tags | sed -r "s/$search/$replace/")
+
+                unset timestamp branch search replace
         fi
 }
@@ -685 +680 @@
 fi
 
-if [ -z "$PYTHON" ]; then
-        PYTHON=python
-fi
-
 if [ "$doc" = "1" ]; then
         # check this here just in case someone tries to install it in python2.4...
-        if ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
+        if ! python -m xml.etree.ElementTree > /dev/null 2>&1; then
                 echo
                 echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
-                echo "(Use the PYTHON environment variable if it's in a weird location)"
                 exit 1
         fi
         echo "DOC=1" >> Makefile.settings
-        echo "PYTHON=$PYTHON" >> Makefile.settings
 fi