diff options
Diffstat (limited to 'share/mk/dist/files.mk')
| -rw-r--r-- | share/mk/dist/files.mk | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/share/mk/dist/files.mk b/share/mk/dist/files.mk index bc3f7ff..d5de946 100644 --- a/share/mk/dist/files.mk +++ b/share/mk/dist/files.mk @@ -6,18 +6,21 @@ ifndef MAKEFILE_DIST_FILES_INCLUDED MAKEFILE_DIST_FILES_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/git.mk -include $(MAKEFILEDIR)/configure/build-depends/grep.mk -include $(MAKEFILEDIR)/configure/build-depends/sed.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/cp.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/test.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 include $(MAKEFILEDIR)/configure/version.mk include $(MAKEFILEDIR)/dist/_.mk DISTFILES := $(shell $(DISTFILESCMD) | $(SED) 's,:,\\:,g') -_DISTFILES := $(patsubst $(srcdir)/%,$(_DISTDIR)/%,$(DISTFILES)) -_DISTPAGES := $(filter $(_DISTDIR)/man%,$(_DISTFILES)) +_DISTFILES := $(patsubst $(srcdir)/%, $(_DISTDIR)/%, $(DISTFILES)) +_DISTPAGES := $(filter $(_DISTDIR)/man/%, $(_DISTFILES)) _DISTVERSION := $(_DISTDIR)/share/mk/configure/version.mk _DISTOTHERS := $(filter-out $(_DISTPAGES) $(_DISTVERSION), $(_DISTFILES)) @@ -27,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; \ @@ -39,18 +40,14 @@ FORCE_DISTVERSION := \ ) -$(_DISTPAGES): $(_DISTDIR)/man%: $(srcdir)/man% $(MK) | $$(@D)/ +$(_DISTPAGES): $(_DISTDIR)/man/%: $(srcdir)/man/% $(MK) | $$(@D)/ $(info $(INFO_)SED $@) - <$< \ - $(SED) "/^.TH/s/(date)/$$($(GIT) log --format=%cs -1 -- $< $(HIDE_ERR))/" \ - | $(SED) '/^.TH/s/(unreleased)/$(DISTVERSION)/' \ - | $(INSTALL_DATA) -T /dev/stdin $@ + $(SED) "/^\.TH/s/(date)/$$($(MANPAGEDATECMD))/" <$< >$@ $(_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 $@ |