projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: always use git describe --all --long for the git version
[lttng-tools.git]
/
include
/
Makefile.am
diff --git
a/include/Makefile.am
b/include/Makefile.am
index d2061f1e05ea75bb7db8fd542dc683d19253bdca..767b05b5d99ff38128713925a7dbd71e12579bd7 100644
(file)
--- a/
include/Makefile.am
+++ b/
include/Makefile.am
@@
-21,8
+21,7
@@
version.h:
git_version=""; \
else \
git_describe="$$(git describe)"; \
git_version=""; \
else \
git_describe="$$(git describe)"; \
- if [ "$${git_branch}" == "$${git_describe}" ] || \
- [ "$${git_branch}" == "heads/master" ]; then \
+ if [ "$${git_branch}" == "$${git_describe}" ]; then \
git_version="$${git_describe}"; \
else \
git_version="$$(git describe --long --all)"; \
git_version="$${git_describe}"; \
else \
git_version="$$(git describe --long --all)"; \
This page took
0.023357 seconds
and
4
git commands to generate.