Changeset b71f599

Timestamp:

2015-05-07T20:53:19Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

33528bd

Parents:

2d93f113 (diff), 041777e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into develop

File:

• configure (modified) (1 diff)

configure

@@ -66 +66 @@
 get_version() {
         REAL_BITLBEE_VERSION=$(grep '^#define BITLBEE_VERSION ' $srcdir/bitlbee.h | sed 's/.*\"\(.*\)\".*/\1/')
+
+        if [ -n "$BITLBEE_VERSION" ]; then
+                # environment variable already set to something to spoof it
+                # don't replace it with the git stuff
+                return
+        fi
+
         BITLBEE_VERSION=$REAL_BITLBEE_VERSION