Changeset b71f599


Ignore:
Timestamp:
2015-05-07T20:53:19Z (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r2d93f113 rb71f599  
    6666get_version() {
    6767        REAL_BITLBEE_VERSION=$(grep '^#define BITLBEE_VERSION ' $srcdir/bitlbee.h | sed 's/.*\"\(.*\)\".*/\1/')
     68
     69        if [ -n "$BITLBEE_VERSION" ]; then
     70                # environment variable already set to something to spoof it
     71                # don't replace it with the git stuff
     72                return
     73        fi
     74
    6875        BITLBEE_VERSION=$REAL_BITLBEE_VERSION
    6976
Note: See TracChangeset for help on using the changeset viewer.