diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-24 04:52:24 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-24 04:52:24 +0000 |
commit | 100d1b33f088fd38f69129afff7f9c2a1e084a57 (patch) | |
tree | 5bf6b0bb14f22ecf0a5e9439fdd4c4758402400c /share/mk/build/pre | |
parent | Releasing progress-linux version 6.7-2~progress7.99u1. (diff) | |
download | manpages-100d1b33f088fd38f69129afff7f9c2a1e084a57.tar.xz manpages-100d1b33f088fd38f69129afff7f9c2a1e084a57.zip |
Merging upstream version 6.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/mk/build/pre')
-rw-r--r-- | share/mk/build/pre/preconv.mk | 11 | ||||
-rw-r--r-- | share/mk/build/pre/tbl.mk | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/share/mk/build/pre/preconv.mk b/share/mk/build/pre/preconv.mk index 73aa1da..6e8c881 100644 --- a/share/mk/build/pre/preconv.mk +++ b/share/mk/build/pre/preconv.mk @@ -6,16 +6,15 @@ ifndef MAKEFILE_BUILD_PRE_PRECONV_INCLUDED MAKEFILE_BUILD_PRE_PRECONV_INCLUDED := 1 -include $(MAKEFILEDIR)/build/_.mk -include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk -include $(MAKEFILEDIR)/configure/src.mk -include $(MAKEFILEDIR)/src.mk +include $(MAKEFILEDIR)/build/man/man.mk +include $(MAKEFILEDIR)/build/man/mdoc.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base/preconv.mk -_MAN_tbl := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.tbl,$(NONSO_MAN) $(NONSO_MDOC)) +_MAN_tbl := $(patsubst %, %.tbl, $(_NONSO_MAN) $(_NONSO_MDOC)) -$(_MAN_tbl): $(_MANDIR)/%.tbl: $(MANDIR)/% $(MK) | $$(@D)/ +$(_MAN_tbl): %.tbl: % $(MK) | $$(@D)/ $(info $(INFO_)PRECONV $@) $(PRECONV) $(PRECONVFLAGS) $< >$@ diff --git a/share/mk/build/pre/tbl.mk b/share/mk/build/pre/tbl.mk index 24486f8..0deb42e 100644 --- a/share/mk/build/pre/tbl.mk +++ b/share/mk/build/pre/tbl.mk @@ -7,7 +7,7 @@ MAKEFILE_BUILD_PRE_TBL_INCLUDED := 1 include $(MAKEFILEDIR)/build/pre/preconv.mk -include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base/tbl.mk _MAN_eqn := $(patsubst %.tbl,%.eqn,$(_MAN_tbl)) |