Changeset f287f04

Timestamp:

2014-06-26T08:07:11Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

3e7a722

Parents:

4e4fa93

Message:

Fix version in pkg-config file, also change bzr version format slightly

Old bzr version format: bzr-1234
New bzr version format: 3.2.1-bzr-1234

Version spoofing with the BITLBEE_VERSION also changed slightly - it
does not need quotes around the version number anymore for it to compile
correctly.

File:

• configure (modified) (3 diffs)

configure

@@ -541 +541 @@
 fi
 
+REAL_BITLBEE_VERSION=`grep '^#define BITLBEE_VERSION ' $srcdir/bitlbee.h | sed 's/.*\"\(.*\)\".*/\1/'`
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
@@ -551 +552 @@
         rev=`bzr revno`
         echo 'Using bzr revision #'$rev' as version number'
-        BITLBEE_VERSION=\"bzr$nick-$rev\"
+        BITLBEE_VERSION=$REAL_BITLBEE_VERSION-bzr$nick-$rev
 fi
 
@@ -557 +558 @@
         echo 'Spoofing version number: '$BITLBEE_VERSION
         echo '#undef BITLBEE_VERSION' >> config.h
-        echo '#define BITLBEE_VERSION '$BITLBEE_VERSION >> config.h
-        echo
+        echo '#define BITLBEE_VERSION "'$BITLBEE_VERSION'"' >> config.h
+        echo
+else
+        # for pkg-config
+        BITLBEE_VERSION=$REAL_BITLBEE_VERSION
 fi