Merge pull request #1413 from philsmd/master

fixes #1412: sed for VERSION_EXPORT fixed compilation problem
pull/1419/head
Jens Steube 7 years ago committed by GitHub
commit 10bb0678c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -127,7 +127,7 @@ COMPTIME := $(shell date +%s)
# the value will be something like this: "tag: vX.Y.Z, refs/pull/Y/head"
VERSION_EXPORT := $Format:%D$
VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)" | $(SED) 's/.*: v\([\.0-9]*\),.*/v\1/')
VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)" | $(SED) 's/.*: v\([\.0-9]*\).*/v\1/')
##
## General compiler and linker options

Loading…
Cancel
Save