at: (sd)man: clean up, rename {,sd}man

1 files changed, 36 insertions, 19 deletions

diff --git a/build-aux/Makefile.each.tail/70-man.mk b/build-aux/Makefile.each.tail/70-sdman.mk
index 3ff381b761..0e4b35b6ce 100644
--- a/build-aux/Makefile.each.tail/70-man.mk
+++ b/build-aux/Makefile.each.tail/70-sdman.mk
@@ -21,39 +21,56 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-mod.man.description = (systemd) manpages
-mod.man.depends += am files write-atomic
+mod.sdman.description = (systemd) manpages
+mod.sdman.depends += am files write-atomic
+define mod.sdman.doc
+# Inputs:
+#   - Global variable    : `ENABLE_MANPAGES`
+#   - Directory variable : `files.src.src`
+# Inputs (from `$(srcdir)/Makefile-man.mk`):
+#   - Directory variable : `sdman.MANPAGES`
+#   - Directory variable : `sdman.MANPAGES_ALIAS`
+# Outputs:
+#   - File               : `$(srcdir)/Makefile-man.mk`
+#   - Directory variable : `at.subdirs`
+#   - Directory variable : `files.src.gen`
+#   - Directory variable : `man_MANS`
+#   - Directory variable : `noinst_DATA`
+#
+# The `sdman.*` variables are the interface by which Makefile-man.mk may
+# communicate up.  They should not be used outside of the `sdman` module.
+endef
+mod.sdman.doc := $(value mod.sdman.doc)
 
-_man.man_xml = $(foreach _man.tmp,$(filter %.xml,$(files.src.src)),$(if $(findstring /,$(_man.tmp)),,$(_man.tmp)))
+_sdman.man_xml = $(foreach _sdman.tmp,$(filter %.xml,$(files.src.src)),$(if $(findstring /,$(_sdman.tmp)),,$(_sdman.tmp)))
 
-ifneq ($(_man.man_xml),)
-#$(info $(outdir)/_man.man_xml: «$(_man.man_xml)»)
+ifneq ($(_sdman.man_xml),)
 
-$(srcdir)/Makefile-man.mk: $(topsrcdir)/tools/make-man-rules.py $(topsrcdir)/tools/xml_helper.py $(topsrcdir)/man/custom-entities.ent.in $(outdir)/.var._man.man_xml $(call at.addprefix,$(srcdir),$(_man.man_xml))
+$(srcdir)/Makefile-man.mk: $(topsrcdir)/tools/make-man-rules.py $(topsrcdir)/tools/xml_helper.py $(topsrcdir)/man/custom-entities.ent.in $(outdir)/.var._sdman.man_xml $(call at.addprefix,$(srcdir),$(_sdman.man_xml))
 	$(AM_V_GEN)$(PYTHON) $< $(filter %.xml,$^) | $(WRITE_ATOMIC) $@
 files.src.gen += Makefile-man.mk
 
-man.MANPAGES =
-man.MANPAGES_ALIAS =
+sdman.MANPAGES =
+sdman.MANPAGES_ALIAS =
 #-include $(srcdir)/Makefile-man.mk
 
-_man.XML_FILES = \
-	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(man.MANPAGES)}}}}}
-man.HTML_FILES = \
-	${_man.XML_FILES:.xml=.html}
-man.HTML_ALIAS = \
-	${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(man.MANPAGES_ALIAS)}}}}}
+_sdman.XML_FILES = \
+	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(sdman.MANPAGES)}}}}}
+_sdman.HTML_FILES = \
+	${_sdman.XML_FILES:.xml=.html}
+_sdman.HTML_ALIAS = \
+	${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(sdman.MANPAGES_ALIAS)}}}}}
 
 ifneq ($(ENABLE_MANPAGES),)
 man_MANS = \
-	$(man.MANPAGES) \
-	$(man.MANPAGES_ALIAS)
+	$(sdman.MANPAGES) \
+	$(sdman.MANPAGES_ALIAS)
 
 noinst_DATA += \
-	$(man.HTML_FILES) \
-	$(man.HTML_ALIAS)
+	$(_sdman.HTML_FILES) \
+	$(_sdman.HTML_ALIAS)
 endif # ENABLE_MANPAGES
 
 at.subdirs += $(abspath $(topoutdir)/man)
 
-endif # _man.man_xml
+endif # _sdman.man_xml