diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-07-29 17:48:48 +0200 |
---|---|---|
committer | Daniel Borkmann <dborkman@redhat.com> | 2013-07-29 17:48:48 +0200 |
commit | 5526c432c74c4196de724d2da7a43b186eb249b0 (patch) | |
tree | 5921749e5fc93ea35d5ebcf39c6042701847d8f1 /Cmds | |
parent | b25ff2b27347d8559b96b4d82c7540a6c5023e5c (diff) |
build: use VERSION_SHORT instead of VERSION_STRING
We have recently changed VERSION_STRING to append CONFIG_RC at the
end of the string. Thus, for the build system, change it to
VERSION_SHORT where needed, e.g. in release targets where the "+"
appendix is not wished.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'Cmds')
-rw-r--r-- | Cmds | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -32,10 +32,10 @@ RMDIR = echo -e " RM\t$(1)" && rmdir --ignore-fail-on-non-empty $(1) 2> /dev/nu GZIP = gzip --best -c # Git related -GIT_ARCHIVE = git archive --prefix=netsniff-ng-$(VERSION_STRING)/ v$(VERSION_STRING) | \ - $(1) > ../netsniff-ng-$(VERSION_STRING).tar.$(2) -GIT_TAG = git tag -a $(VERSION_STRING) -s -m "tools: $(VERSION_STRING) release" +GIT_ARCHIVE = git archive --prefix=netsniff-ng-$(VERSION_SHORT)/ v$(VERSION_SHORT) | \ + $(1) > ../netsniff-ng-$(VERSION_SHORT).tar.$(2) +GIT_TAG = git tag -a $(VERSION_SHORT) -s -m "$(VERSION_SHORT) release" GIT_LOG = git shortlog -n --not $(shell git describe --always --abbrev=0 --tags) GIT_REM = git ls-files -o | xargs rm -rf -GIT_PEOPLE = git log --no-merges $(VERSION_STRING)..HEAD | grep Author: | cut -d: -f2 | \ +GIT_PEOPLE = git log --no-merges $(VERSION_SHORT)..HEAD | grep Author: | cut -d: -f2 | \ cut -d\< -f1 | sort | uniq -c | sort -nr |