Przeglądaj źródła

mk/targets.mk: consider only release_* tags for constructing version strings

Cherry-picked from d1692902f1, which was dropped by force-pushing 79873390ed.
Achim Gratz 10 lat temu
rodzic
commit
3f67b185cc
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      mk/targets.mk

+ 2 - 2
mk/targets.mk

@@ -11,8 +11,8 @@ INSTSUB       = $(SUBDIRS:%=install-%)
 ORG_MAKE_DOC ?= info html pdf
 
 ifneq ($(wildcard .git),)
-  GITVERSION ?= $(shell git describe --abbrev=6 HEAD)
-  ORGVERSION ?= $(subst release_,,$(shell git describe --abbrev=0 HEAD))
+  GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD)
+  ORGVERSION ?= $(subst release_,,$(shell git describe --match release\* --abbrev=0 HEAD))
   GITSTATUS  ?= $(shell git status -uno --porcelain)
 else
  -include mk/version.mk