From 34455501de74c405b56daa438ee3e839e92fbc17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mario=20Bl=C3=A4ttermann?= Date: Tue, 16 Mar 2021 19:34:59 +0100 Subject: [PATCH] Asciidoc: Adapt Makefiles to new asciidoc man pages --- Makefile.am | 18 ++++++++++++++++++ sys-utils/Makemodule.am | 2 -- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 12cb86cba4..42b6d2e430 100644 --- a/Makefile.am +++ b/Makefile.am @@ -190,6 +190,24 @@ $(PATHFILES): Makefile $(edit_cmd) $${srcdir}$@.in >$@.tmp @ mv $@.tmp $@ +asciidoc_man_cmd = $(ASCIIDOCTOR) + -b manpage \ + -a 'VERSION=$(VERSION)' \ + -a 'ADJTIME_PATH=$(ADJTIME_PATH)' + +CLEANFILES += $(dist_man_MANS) +EXTRA_DIST += $(dist_man_MANS:=.adoc) + +$(dist_man_MANS): Makefile + @ rm -f $@ + $(AM_V_at) $(MKDIR_P) $$(dirname $@) + $(AM_V_GEN) srcdir=''; \ + test -f ./$@.adoc || srcdir=$(srcdir)/; \ + $(asciidoc_man_cmd) $${srcdir}$@.adoc + +gen-man: $(dist_man_MANS) + + # Arrange so that .tarball-version appears only in the distribution # tarball, and never in a checked-out repository. dist-hook: diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index df8fd403a7..0d02ca9d67 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -186,7 +186,6 @@ endif if BUILD_RTCWAKE usrsbin_exec_PROGRAMS += rtcwake dist_man_MANS += sys-utils/rtcwake.8 -PATHFILES += sys-utils/rtcwake.8 rtcwake_SOURCES = sys-utils/rtcwake.c rtcwake_LDADD = $(LDADD) libcommon.la endif @@ -482,7 +481,6 @@ sbin_PROGRAMS += hwclock dist_man_MANS += \ sys-utils/hwclock.8 \ sys-utils/adjtime_config.5 -PATHFILES += sys-utils/hwclock.8 hwclock_SOURCES = \ sys-utils/hwclock.c \ sys-utils/hwclock.h -- 2.47.3