share/mk/: Derive $DISTNAME from $DISTVERSION

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/share/mk/configure/version.mk b/share/mk/configure/version.mk
index 2ef5d0e4ab9e6e75a28e1f10f8b99dae9d4c5684..89e0002f2a87d1a78fdab1ace39aadfbd7fc2ec4 100644 (file)
--- a/share/mk/configure/version.mk
+++ b/share/mk/configure/version.mk
@@ -14,11 +14,16 @@ include $(MAKEFILEDIR)/configure/build-depends/findutils/find.mk
 include $(MAKEFILEDIR)/configure/build-depends/findutils/xargs.mk
 include $(MAKEFILEDIR)/configure/build-depends/git/git.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk
 include $(MAKEFILEDIR)/configure/verbose.mk
 
 
-DISTNAME    := $(shell $(GIT) describe --dirty)
-DISTVERSION := $(patsubst man-pages-%,%,$(DISTNAME))
+projname     := man-pages
+VERSION      := $(shell $(GIT) describe --dirty | $(SED) 's/$(projname)-//')
+
+
+DISTVERSION := $(VERSION)
+DISTNAME    := $(projname)-$(DISTVERSION)
 
 
 DISTFILESCMD := \

diff --git a/share/mk/dist/files.mk b/share/mk/dist/files.mk
index af75c440de7729834b55a64499f80bb302449b3f..b9d0ef07f6bd9f1bf65c942d30b2d433b7b39d96 100644 (file)
--- a/share/mk/dist/files.mk
+++ b/share/mk/dist/files.mk
@@ -30,11 +30,9 @@ FORCE_DISTVERSION := \
                if $(TEST) -f $(_DISTVERSION); then \
                        <$(_DISTVERSION) \
                        $(GREP) \
-                               -e '^DISTVERSION :=' \
-                               -e '^DISTNAME :=' \
+                               -e '^VERSION :=' \
                                -e '^DISTDATE :=' \
-                       | $(SED) '/^DISTVERSION := $(DISTVERSION)$$/d' \
-                       | $(SED) '/^DISTNAME := $(DISTNAME)$$/d' \
+                       | $(SED) '/^VERSION := $(VERSION)$$/d' \
                        | $(SED) '/^DISTDATE := $(DISTDATE)$$/d' \
                        | $(GREP) ^ $(HIDE_ERR) >&2 \
                        && $(ECHO) FORCE; \
@@ -49,8 +47,7 @@ $(_DISTPAGES): $(_DISTDIR)/man%: $(srcdir)/man% $(MK) | $$(@D)/
 $(_DISTVERSION): $(MAKEFILEDIR)/configure/version.mk $(MK) $(FORCE_DISTVERSION) | $$(@D)/
        $(info  $(INFO_)SED             $@)
        <$< \
-       $(SED) 's/^DISTVERSION *:=.*/DISTVERSION := $(DISTVERSION)/' \
-       | $(SED) 's/^DISTNAME *:=.*/DISTNAME := $(DISTNAME)/' \
+       $(SED) 's/^VERSION *:=.*/VERSION := $(VERSION)/' \
        | $(SED) 's/^DISTDATE *:=.*/DISTDATE := $(DISTDATE)/' \
        | $(INSTALL_DATA) -T /dev/stdin $@