diff options
| author | Alejandro Colomar <alx@kernel.org> | 2024-03-24 05:30:52 +0100 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2024-03-24 13:14:23 +0100 |
| commit | 12d38da9016a43c7d9f5205f6432864b625b033d (patch) | |
| tree | 7ec9be8c00368b191ff5010c77e064208a0b0994 | |
| parent | 57d0f8b4f1ba43fd4c4bfbe826d1b255c6ef9fd5 (diff) | |
| download | man-pages-12d38da9016a43c7d9f5205f6432864b625b033d.tar.gz | |
share/mk/: Derive $DISTNAME from $DISTVERSION
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | share/mk/configure/version.mk | 9 | ||||
| -rw-r--r-- | share/mk/dist/files.mk | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/share/mk/configure/version.mk b/share/mk/configure/version.mk index 2ef5d0e4ab..89e0002f2a 100644 --- 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 af75c440de..b9d0ef07f6 100644 --- 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 $@ |