forked from srbala/fedora-kickstarts
Use git version to get version name
Using git version is simpler as it handles oddball cases internally. Since we have been using mostly lightweight tags I have set it to search those in addition to annotated tags for the best match. The output for commits that don't have a tag seems a bit nicer as well. Conflicts: Makefile
This commit is contained in:
parent
d22816d5ff
commit
dcebd2c540
8
Makefile
8
Makefile
@ -1,9 +1,5 @@
|
|||||||
# Get the version name first by seeing if HEAD is tagged
|
# Get a version name based off the nearest tag (include lightweight tags)
|
||||||
version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1)
|
version := $(shell git describe --tags)
|
||||||
# And if it wasn't use a git hash
|
|
||||||
ifeq ($(version),)
|
|
||||||
version := $(shell git log -1 --abbrev=8 --pretty=git%h)
|
|
||||||
endif
|
|
||||||
|
|
||||||
DESTDIR := /usr
|
DESTDIR := /usr
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user