build-sys: split man pages and man page links

The symlinks are generated by asciidoctor and current dist_man_MANS
depends on order (nan page before man link). This solutions is useless
when execute "make -j". The real solution is to keep man pages in
separate variable and use only this variable evaluate what we need to
generate.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 3f0c04cdaf29e989fea710ae59efa644702efbc3..40d72784de23eed1d32e309551f5a393a808af7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,8 @@ UNINSTALL_HOOKS =
 INSTALL_DATA_HOOKS =
 CLEAN_LOCALS =
 CHECK_LOCALS =
+MANPAGES =
+MANLINKS =
 
 EXTRA_DIST =
 CLEANFILES =
@@ -195,10 +197,13 @@ asciidoc_man_cmd = $(ASCIIDOCTOR) \
        -a 'VERSION=$(VERSION)' \
        -a 'ADJTIME_PATH=$(ADJTIME_PATH)'
 
+dist_man_MANS += $(MANPAGES) $(MANLINKS)
+
 CLEANFILES += $(dist_man_MANS)
-EXTRA_DIST += $(dist_man_MANS:=.adoc)
+EXTRA_DIST += $(MANPAGES:=.adoc)
+
 
-$(dist_man_MANS): Makefile
+$(MANPAGES): Makefile
        @ rm -f $@
        $(AM_V_at) $(MKDIR_P) $$(dirname $@)
        $(AM_V_GEN) srcdir=''; \

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 58f42ea23ea4b97f57a757793460088901ba8a99..cd993a5775dce8750e36e13e8bb45d6d4f976aa5 100644 (file)
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -1,7 +1,7 @@
 
 if BUILD_MINIX
 sbin_PROGRAMS += fsck.minix
-dist_man_MANS += disk-utils/fsck.minix.8
+MANPAGES += disk-utils/fsck.minix.8
 fsck_minix_SOURCES = \
        disk-utils/fsck.minix.c \
        disk-utils/minix_programs.h \
@@ -9,7 +9,7 @@ fsck_minix_SOURCES = \
 fsck_minix_LDADD = $(LDADD) libcommon.la
 
 sbin_PROGRAMS += mkfs.minix
-dist_man_MANS += disk-utils/mkfs.minix.8
+MANPAGES += disk-utils/mkfs.minix.8
 mkfs_minix_SOURCES = \
        disk-utils/minix_programs.h \
        disk-utils/mkfs.minix.c \
@@ -25,14 +25,14 @@ endif
 
 if BUILD_MKFS
 sbin_PROGRAMS += mkfs
-dist_man_MANS += disk-utils/mkfs.8
+MANPAGES += disk-utils/mkfs.8
 mkfs_SOURCES = disk-utils/mkfs.c
 endif
 
 
 if BUILD_ISOSIZE
 usrbin_exec_PROGRAMS += isosize
-dist_man_MANS += disk-utils/isosize.8
+MANPAGES += disk-utils/isosize.8
 isosize_SOURCES = disk-utils/isosize.c
 isosize_LDADD = $(LDADD) libcommon.la
 endif
@@ -40,7 +40,7 @@ endif
 
 if BUILD_BFS
 sbin_PROGRAMS += mkfs.bfs
-dist_man_MANS += disk-utils/mkfs.bfs.8
+MANPAGES += disk-utils/mkfs.bfs.8
 mkfs_bfs_SOURCES = \
        disk-utils/mkfs.bfs.c
 mkfs_bfs_LDADD = $(LDADD) libcommon.la
@@ -49,7 +49,7 @@ endif
 
 if BUILD_MKSWAP
 sbin_PROGRAMS += mkswap
-dist_man_MANS += disk-utils/mkswap.8
+MANPAGES += disk-utils/mkswap.8
 mkswap_SOURCES = \
        disk-utils/mkswap.c \
        lib/ismounted.c
@@ -75,7 +75,7 @@ endif # BUILD_MKSWAP
 
 if BUILD_SWAPLABEL
 sbin_PROGRAMS += swaplabel
-dist_man_MANS += disk-utils/swaplabel.8
+MANPAGES += disk-utils/swaplabel.8
 swaplabel_SOURCES = \
        disk-utils/swaplabel.c \
        lib/swapprober.c \
@@ -93,7 +93,7 @@ endif #BUILD_SWAPLABEL
 
 if BUILD_FSCK
 sbin_PROGRAMS += fsck
-dist_man_MANS += disk-utils/fsck.8
+MANPAGES += disk-utils/fsck.8
 fsck_SOURCES = disk-utils/fsck.c lib/monotonic.c
 fsck_LDADD = $(LDADD) libmount.la libblkid.la libcommon.la $(REALTIME_LIBS)
 fsck_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir)
@@ -102,7 +102,7 @@ endif
 
 if BUILD_RAW
 sbin_PROGRAMS += raw
-dist_man_MANS += disk-utils/raw.8
+MANPAGES += disk-utils/raw.8
 raw_SOURCES = disk-utils/raw.c
 endif
 
@@ -112,24 +112,24 @@ cramfs_common_sources = disk-utils/cramfs.h disk-utils/cramfs_common.c
 sbin_PROGRAMS += fsck.cramfs
 fsck_cramfs_SOURCES = disk-utils/fsck.cramfs.c $(cramfs_common_sources)
 fsck_cramfs_LDADD = $(LDADD) -lz libcommon.la
-dist_man_MANS += disk-utils/fsck.cramfs.8
+MANPAGES += disk-utils/fsck.cramfs.8
 
 sbin_PROGRAMS += mkfs.cramfs
 mkfs_cramfs_SOURCES = disk-utils/mkfs.cramfs.c $(cramfs_common_sources)
 mkfs_cramfs_LDADD = $(LDADD) -lz libcommon.la
-dist_man_MANS += disk-utils/mkfs.cramfs.8
+MANPAGES += disk-utils/mkfs.cramfs.8
 endif
 
 if BUILD_FDFORMAT
 usrsbin_exec_PROGRAMS += fdformat
-dist_man_MANS += disk-utils/fdformat.8
+MANPAGES += disk-utils/fdformat.8
 fdformat_SOURCES = disk-utils/fdformat.c
 fdformat_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_BLOCKDEV
 sbin_PROGRAMS += blockdev
-dist_man_MANS += disk-utils/blockdev.8
+MANPAGES += disk-utils/blockdev.8
 blockdev_SOURCES = disk-utils/blockdev.c
 blockdev_LDADD = $(LDADD) libcommon.la
 endif
@@ -137,7 +137,7 @@ endif
 
 if BUILD_FDISK
 sbin_PROGRAMS += fdisk
-dist_man_MANS += disk-utils/fdisk.8
+MANPAGES += disk-utils/fdisk.8
 fdisk_SOURCES = \
        disk-utils/fdisk.c \
        disk-utils/fdisk.h \
@@ -161,7 +161,7 @@ endif # BUILD_FDISK
 
 if BUILD_SFDISK
 sbin_PROGRAMS += sfdisk
-dist_man_MANS += disk-utils/sfdisk.8
+MANPAGES += disk-utils/sfdisk.8
 sfdisk_SOURCES = \
        disk-utils/sfdisk.c \
        disk-utils/fdisk-list.c \
@@ -183,7 +183,7 @@ endif # BUILD_SFDISK
 
 if BUILD_CFDISK
 sbin_PROGRAMS += cfdisk
-dist_man_MANS += disk-utils/cfdisk.8
+MANPAGES += disk-utils/cfdisk.8
 cfdisk_SOURCES = disk-utils/cfdisk.c
 cfdisk_LDADD = \
        $(LDADD) \
@@ -212,7 +212,7 @@ endif # BUILD_CFDISK
 
 if BUILD_PARTX
 usrsbin_exec_PROGRAMS += partx addpart delpart resizepart
-dist_man_MANS += \
+MANPAGES += \
        disk-utils/addpart.8 \
        disk-utils/delpart.8 \
        disk-utils/resizepart.8 \

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index f975e0cd38c2750b6602f70e5dc73e8480278413..1d3cb985366b7da36a22e1803127e556ef7b4ccd 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -75,7 +75,7 @@ libtcolors_la_CFLAGS += $(NCURSES_CFLAGS)
 endif
 endif # !HAVE_TINFO
 
-dist_man_MANS += lib/terminal-colors.d.5
+MANPAGES += lib/terminal-colors.d.5
 
 
 check_PROGRAMS += \

diff --git a/libblkid/Makemodule.am b/libblkid/Makemodule.am
index f1d1e8d00d83ddf04be991aeade82516f6cf5bd4..33c73595eeedd1a3b6698cd69c72837fc9b0b043 100644 (file)
--- a/libblkid/Makemodule.am
+++ b/libblkid/Makemodule.am
@@ -10,7 +10,7 @@ endif
 
 pkgconfig_DATA += libblkid/blkid.pc
 PATHFILES      += libblkid/blkid.pc
-dist_man_MANS  += libblkid/libblkid.3
+MANPAGES  += libblkid/libblkid.3
 EXTRA_DIST     += libblkid/COPYING
 
 endif # BUILD_LIBBLKID

diff --git a/libuuid/man/Makemodule.am b/libuuid/man/Makemodule.am
index 81287d5c796814d5911760490fc4924e1295fc1c..c373fe9bd018034003ebb7a335c4151f9b8b01ee 100644 (file)
--- a/libuuid/man/Makemodule.am
+++ b/libuuid/man/Makemodule.am
@@ -1,5 +1,5 @@
 
-dist_man_MANS += \
+MANPAGES += \
        libuuid/man/uuid.3 \
        libuuid/man/uuid_clear.3 \
        libuuid/man/uuid_compare.3 \
@@ -8,7 +8,9 @@ dist_man_MANS += \
        libuuid/man/uuid_is_null.3 \
        libuuid/man/uuid_parse.3 \
        libuuid/man/uuid_time.3 \
-       libuuid/man/uuid_unparse.3 \
+       libuuid/man/uuid_unparse.3
+
+MANLINKS += \
        libuuid/man/uuid_generate_random.3 \
        libuuid/man/uuid_generate_time.3 \
        libuuid/man/uuid_generate_time_safe.3

diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 9a9ffae204ed21a4376dd9b112abdf279c4327a4..cad6c44f0843fa94147f4d6ba86d588bfb0691ad 100644 (file)
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -1,9 +1,8 @@
 
 if BUILD_LAST
 usrbin_exec_PROGRAMS += last
-dist_man_MANS += \
-       login-utils/last.1 \
-       login-utils/lastb.1
+MANPAGES += login-utils/last.1
+MANLINKS += login-utils/lastb.1
 last_SOURCES = login-utils/last.c lib/monotonic.c
 last_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
 
@@ -28,7 +27,7 @@ endif
 
 if BUILD_SULOGIN
 sbin_PROGRAMS += sulogin
-dist_man_MANS += login-utils/sulogin.8
+MANPAGES += login-utils/sulogin.8
 sulogin_SOURCES = \
        login-utils/sulogin.c \
        login-utils/sulogin-consoles.c \
@@ -54,7 +53,7 @@ endif # BUILD_SULOGIN
 
 if BUILD_LOGIN
 bin_PROGRAMS += login
-dist_man_MANS += login-utils/login.1
+MANPAGES += login-utils/login.1
 login_SOURCES = \
        login-utils/login.c \
        login-utils/logindefs.c \
@@ -77,7 +76,7 @@ endif # BUILD_LOGIN
 
 if BUILD_NOLOGIN
 sbin_PROGRAMS += nologin
-dist_man_MANS += login-utils/nologin.8
+MANPAGES += login-utils/nologin.8
 nologin_SOURCES = login-utils/nologin.c
 nologin_LDADD = $(LDADD) libcommon.la
 endif
@@ -85,7 +84,7 @@ endif
 
 if BUILD_UTMPDUMP
 usrbin_exec_PROGRAMS += utmpdump
-dist_man_MANS += login-utils/utmpdump.1
+MANPAGES += login-utils/utmpdump.1
 utmpdump_SOURCES = login-utils/utmpdump.c
 utmpdump_LDADD = $(LDADD) libcommon.la
 endif
@@ -93,7 +92,7 @@ endif
 
 if BUILD_CHFN_CHSH
 usrbin_exec_PROGRAMS += chfn chsh
-dist_man_MANS += \
+MANPAGES += \
        login-utils/chfn.1 \
        login-utils/chsh.1
 
@@ -156,7 +155,7 @@ endif # BUILD_CHFN_CHSH
 
 if BUILD_SU
 bin_PROGRAMS += su
-dist_man_MANS += login-utils/su.1
+MANPAGES += login-utils/su.1
 su_SOURCES = \
        login-utils/su.c \
        login-utils/su-common.c \
@@ -183,7 +182,7 @@ endif # BUILD_SU
 
 if BUILD_RUNUSER
 sbin_PROGRAMS += runuser
-dist_man_MANS += login-utils/runuser.1
+MANPAGES += login-utils/runuser.1
 runuser_SOURCES = \
        login-utils/runuser.c \
        login-utils/su-common.c \
@@ -208,7 +207,7 @@ endif # BUILD_RUNUSER
 
 if BUILD_NEWGRP
 usrbin_exec_PROGRAMS += newgrp
-dist_man_MANS += login-utils/newgrp.1
+MANPAGES += login-utils/newgrp.1
 newgrp_SOURCES = login-utils/newgrp.c
 newgrp_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 newgrp_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
@@ -220,7 +219,7 @@ endif # BUILD_NEWGRP
 
 if BUILD_LSLOGINS
 usrbin_exec_PROGRAMS += lslogins
-dist_man_MANS += login-utils/lslogins.1
+MANPAGES += login-utils/lslogins.1
 lslogins_SOURCES = \
        login-utils/lslogins.c \
        login-utils/logindefs.c \
@@ -241,9 +240,8 @@ endif # BUILD_LSLOGINS
 
 if BUILD_VIPW
 usrsbin_exec_PROGRAMS += vipw
-dist_man_MANS += \
-       login-utils/vipw.8 \
-       login-utils/vigr.8
+MANPAGES += ogin-utils/vipw.8
+MANLINKS += login-utils/vigr.8
 vipw_SOURCES = \
        login-utils/vipw.c \
        login-utils/setpwnam.h

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 6f19dc4b81ad4cae57574185821019f7e742efa3..8e1a8590d5f1fb445fcb02b050e68f234fc36aad 100644 (file)
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -1,6 +1,6 @@
 if BUILD_CAL
 usrbin_exec_PROGRAMS += cal
-dist_man_MANS += misc-utils/cal.1
+MANPAGES += misc-utils/cal.1
 cal_SOURCES = misc-utils/cal.c
 cal_CFLAGS = $(AM_CFLAGS)
 cal_LDADD = $(LDADD) libcommon.la libtcolors.la
@@ -24,7 +24,7 @@ endif # BUILD_CAL
 
 if BUILD_LOGGER
 usrbin_exec_PROGRAMS += logger
-dist_man_MANS += misc-utils/logger.1
+MANPAGES += misc-utils/logger.1
 logger_SOURCES = misc-utils/logger.c lib/strutils.c lib/strv.c
 logger_LDADD = $(LDADD)
 logger_CFLAGS = $(AM_CFLAGS)
@@ -42,33 +42,33 @@ endif # BUILD_LOGGER
 
 if BUILD_LOOK
 usrbin_exec_PROGRAMS += look
-dist_man_MANS += misc-utils/look.1
+MANPAGES += misc-utils/look.1
 look_SOURCES = misc-utils/look.c
 endif
 
 if BUILD_MCOOKIE
 usrbin_exec_PROGRAMS += mcookie
-dist_man_MANS += misc-utils/mcookie.1
+MANPAGES += misc-utils/mcookie.1
 mcookie_SOURCES = misc-utils/mcookie.c lib/md5.c
 mcookie_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_NAMEI
 usrbin_exec_PROGRAMS += namei
-dist_man_MANS += misc-utils/namei.1
+MANPAGES += misc-utils/namei.1
 namei_SOURCES = misc-utils/namei.c lib/strutils.c lib/idcache.c
 endif
 
 if BUILD_WHEREIS
 usrbin_exec_PROGRAMS += whereis
-dist_man_MANS += misc-utils/whereis.1
+MANPAGES += misc-utils/whereis.1
 whereis_SOURCES = misc-utils/whereis.c
 whereis_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_LSLOCKS
 usrbin_exec_PROGRAMS += lslocks
-dist_man_MANS += misc-utils/lslocks.8
+MANPAGES += misc-utils/lslocks.8
 lslocks_LDADD = $(LDADD) libcommon.la libmount.la libsmartcols.la
 lslocks_SOURCES = misc-utils/lslocks.c
 lslocks_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libsmartcols_incdir)
@@ -76,7 +76,7 @@ endif
 
 if BUILD_LSBLK
 bin_PROGRAMS += lsblk
-dist_man_MANS += misc-utils/lsblk.8
+MANPAGES += misc-utils/lsblk.8
 lsblk_SOURCES = \
        misc-utils/lsblk.c \
        misc-utils/lsblk-mnt.c \
@@ -92,7 +92,7 @@ endif # BUILD_LSBLK
 
 if BUILD_UUIDGEN
 usrbin_exec_PROGRAMS += uuidgen
-dist_man_MANS += misc-utils/uuidgen.1
+MANPAGES += misc-utils/uuidgen.1
 uuidgen_SOURCES = misc-utils/uuidgen.c
 uuidgen_LDADD = $(LDADD) libuuid.la
 uuidgen_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir)
@@ -100,7 +100,7 @@ endif
 
 if BUILD_UUIDPARSE
 usrbin_exec_PROGRAMS += uuidparse
-dist_man_MANS += misc-utils/uuidparse.1
+MANPAGES += misc-utils/uuidparse.1
 uuidparse_SOURCES = misc-utils/uuidparse.c
 uuidparse_LDADD = $(LDADD) libcommon.la libuuid.la libsmartcols.la
 uuidparse_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir) -I$(ul_libsmartcols_incdir)
@@ -108,7 +108,7 @@ endif
 
 if BUILD_UUIDD
 usrsbin_exec_PROGRAMS += uuidd
-dist_man_MANS += misc-utils/uuidd.8
+MANPAGES += misc-utils/uuidd.8
 uuidd_LDADD = $(LDADD) libuuid.la libcommon.la $(REALTIME_LIBS)
 uuidd_CFLAGS = $(DAEMON_CFLAGS) $(AM_CFLAGS) -I$(ul_libuuid_incdir)
 uuidd_LDFLAGS = $(DAEMON_LDFLAGS) $(AM_LDFLAGS)
@@ -134,7 +134,7 @@ PATHFILES += \
 
 if BUILD_BLKID
 sbin_PROGRAMS += blkid
-dist_man_MANS += misc-utils/blkid.8
+MANPAGES += misc-utils/blkid.8
 blkid_SOURCES = misc-utils/blkid.c \
                lib/ismounted.c
 blkid_LDADD = $(LDADD) libblkid.la libcommon.la
@@ -152,7 +152,7 @@ endif # BUILD_BLKID
 
 if BUILD_FINDFS
 sbin_PROGRAMS += findfs
-dist_man_MANS += misc-utils/findfs.8
+MANPAGES += misc-utils/findfs.8
 findfs_LDADD = $(LDADD) libblkid.la
 findfs_SOURCES = misc-utils/findfs.c
 findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
@@ -160,7 +160,7 @@ endif
 
 if BUILD_WIPEFS
 sbin_PROGRAMS += wipefs
-dist_man_MANS += misc-utils/wipefs.8
+MANPAGES += misc-utils/wipefs.8
 wipefs_SOURCES = misc-utils/wipefs.c
 wipefs_LDADD = $(LDADD) libblkid.la libcommon.la libsmartcols.la
 wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libsmartcols_incdir)
@@ -168,7 +168,7 @@ endif
 
 if BUILD_FINDMNT
 bin_PROGRAMS += findmnt
-dist_man_MANS += misc-utils/findmnt.8
+MANPAGES += misc-utils/findmnt.8
 findmnt_LDADD = $(LDADD) libmount.la \
                libcommon.la \
                libsmartcols.la \
@@ -190,18 +190,18 @@ if BUILD_KILL
 bin_PROGRAMS += kill
 kill_SOURCES = misc-utils/kill.c
 kill_LDADD = $(LDADD) libcommon.la
-dist_man_MANS += misc-utils/kill.1
+MANPAGES += misc-utils/kill.1
 endif
 
 if BUILD_RENAME
 usrbin_exec_PROGRAMS += rename
-dist_man_MANS += misc-utils/rename.1
+MANPAGES += misc-utils/rename.1
 rename_SOURCES = misc-utils/rename.c
 endif
 
 if BUILD_GETOPT
 usrbin_exec_PROGRAMS += getopt
-dist_man_MANS += misc-utils/getopt.1
+MANPAGES += misc-utils/getopt.1
 getopt_SOURCES = misc-utils/getopt.c
 getopt_LDADD = $(LDADD) libcommon.la
 getoptexampledir = $(docdir)
@@ -212,7 +212,7 @@ endif
 
 if BUILD_FINCORE
 usrbin_exec_PROGRAMS += fincore
-dist_man_MANS += misc-utils/fincore.1
+MANPAGES += misc-utils/fincore.1
 fincore_SOURCES = misc-utils/fincore.c
 fincore_LDADD = $(LDADD) libsmartcols.la libcommon.la
 fincore_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
@@ -227,5 +227,5 @@ if HAVE_PCRE2_POSIX
 hardlink_LDADD += $(PCRE2_POSIX_LIBS)
 hardlink_CFLAGS += $(PCRE2_POSIX_CFLAGS)
 endif
-dist_man_MANS += misc-utils/hardlink.1
+MANPAGES += misc-utils/hardlink.1
 endif

diff --git a/schedutils/Makemodule.am b/schedutils/Makemodule.am
index e55cc4e73427043c5e3d4a0f0334afa344c92524..56a3716d9f8e681b3f0752bdaba94b1fbb3b240f 100644 (file)
--- a/schedutils/Makemodule.am
+++ b/schedutils/Makemodule.am
@@ -1,27 +1,27 @@
 if BUILD_CHRT
 usrbin_exec_PROGRAMS += chrt
-dist_man_MANS += schedutils/chrt.1
+MANPAGES += schedutils/chrt.1
 chrt_SOURCES = schedutils/chrt.c schedutils/sched_attr.h
 chrt_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_IONICE
 usrbin_exec_PROGRAMS += ionice
-dist_man_MANS += schedutils/ionice.1
+MANPAGES += schedutils/ionice.1
 ionice_SOURCES = schedutils/ionice.c
 ionice_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_TASKSET
 usrbin_exec_PROGRAMS += taskset
-dist_man_MANS += schedutils/taskset.1
+MANPAGES += schedutils/taskset.1
 taskset_SOURCES = schedutils/taskset.c
 taskset_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_UCLAMPSET
 usrbin_exec_PROGRAMS += uclampset
-dist_man_MANS += schedutils/uclampset.1
+MANPAGES += schedutils/uclampset.1
 uclampset_SOURCES = schedutils/uclampset.c schedutils/sched_attr.h
 uclampset_LDADD = $(LDADD) libcommon.la
 endif

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 27223c01bd143c5eb1e595d516efaf925641a2cc..baad296ecf24d42fe234853c5f8bf323cb91c359 100644 (file)
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -1,6 +1,6 @@
 if BUILD_LSMEM
 usrbin_exec_PROGRAMS += lsmem
-dist_man_MANS += sys-utils/lsmem.1
+MANPAGES += sys-utils/lsmem.1
 lsmem_SOURCES = sys-utils/lsmem.c
 lsmem_LDADD = $(LDADD) libcommon.la libsmartcols.la
 lsmem_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
@@ -8,42 +8,42 @@ endif
 
 if BUILD_CHMEM
 usrbin_exec_PROGRAMS += chmem
-dist_man_MANS += sys-utils/chmem.8
+MANPAGES += sys-utils/chmem.8
 chmem_SOURCES = sys-utils/chmem.c
 chmem_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_FLOCK
 usrbin_exec_PROGRAMS += flock
-dist_man_MANS += sys-utils/flock.1
+MANPAGES += sys-utils/flock.1
 flock_SOURCES = sys-utils/flock.c lib/monotonic.c lib/timer.c
 flock_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
 endif
 
 if BUILD_CHOOM
 usrbin_exec_PROGRAMS += choom
-dist_man_MANS += sys-utils/choom.1
+MANPAGES += sys-utils/choom.1
 choom_SOURCES = sys-utils/choom.c
 choom_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_IPCMK
 usrbin_exec_PROGRAMS += ipcmk
-dist_man_MANS += sys-utils/ipcmk.1
+MANPAGES += sys-utils/ipcmk.1
 ipcmk_SOURCES = sys-utils/ipcmk.c
 ipcmk_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_IPCRM
 usrbin_exec_PROGRAMS += ipcrm
-dist_man_MANS += sys-utils/ipcrm.1
+MANPAGES += sys-utils/ipcrm.1
 ipcrm_SOURCES = sys-utils/ipcrm.c
 ipcrm_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_IPCS
 usrbin_exec_PROGRAMS += ipcs
-dist_man_MANS += sys-utils/ipcs.1
+MANPAGES += sys-utils/ipcs.1
 ipcs_SOURCES = sys-utils/ipcs.c \
                sys-utils/ipcutils.c \
                sys-utils/ipcutils.h
@@ -52,7 +52,7 @@ endif
 
 if BUILD_IRQTOP
 usrbin_exec_PROGRAMS += irqtop
-dist_man_MANS += sys-utils/irqtop.1
+MANPAGES += sys-utils/irqtop.1
 irqtop_SOURCES = sys-utils/irqtop.c \
                 sys-utils/irq-common.c \
                 sys-utils/irq-common.h \
@@ -69,7 +69,7 @@ endif
 
 if BUILD_LSIRQ
 usrbin_exec_PROGRAMS += lsirq
-dist_man_MANS += sys-utils/lsirq.1
+MANPAGES += sys-utils/lsirq.1
 lsirq_SOURCES =        sys-utils/lsirq.c \
                sys-utils/irq-common.c \
                sys-utils/irq-common.h
@@ -79,7 +79,7 @@ endif
 
 if BUILD_LSIPC
 usrbin_exec_PROGRAMS += lsipc
-dist_man_MANS += sys-utils/lsipc.1
+MANPAGES += sys-utils/lsipc.1
 lsipc_SOURCES =        sys-utils/lsipc.c \
                sys-utils/ipcutils.c \
                sys-utils/ipcutils.h
@@ -89,13 +89,13 @@ endif
 
 if BUILD_RENICE
 usrbin_exec_PROGRAMS += renice
-dist_man_MANS += sys-utils/renice.1
+MANPAGES += sys-utils/renice.1
 renice_SOURCES = sys-utils/renice.c
 endif
 
 if BUILD_RFKILL
 usrsbin_exec_PROGRAMS += rfkill
-dist_man_MANS += sys-utils/rfkill.8
+MANPAGES += sys-utils/rfkill.8
 rfkill_SOURCES = sys-utils/rfkill.c
 rfkill_LDADD = $(LDADD) libcommon.la libsmartcols.la
 rfkill_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
@@ -103,26 +103,26 @@ endif
 
 if BUILD_SETSID
 usrbin_exec_PROGRAMS += setsid
-dist_man_MANS += sys-utils/setsid.1
+MANPAGES += sys-utils/setsid.1
 setsid_SOURCES = sys-utils/setsid.c
 endif
 
 if BUILD_READPROFILE
 usrsbin_exec_PROGRAMS += readprofile
-dist_man_MANS += sys-utils/readprofile.8
+MANPAGES += sys-utils/readprofile.8
 readprofile_SOURCES = sys-utils/readprofile.c
 endif
 
 if BUILD_TUNELP
 usrsbin_exec_PROGRAMS += tunelp
-dist_man_MANS += sys-utils/tunelp.8
+MANPAGES += sys-utils/tunelp.8
 tunelp_SOURCES = sys-utils/tunelp.c
 tunelp_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_FSTRIM
 sbin_PROGRAMS += fstrim
-dist_man_MANS += sys-utils/fstrim.8
+MANPAGES += sys-utils/fstrim.8
 fstrim_SOURCES = sys-utils/fstrim.c
 fstrim_LDADD = $(LDADD) libcommon.la libmount.la
 fstrim_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
@@ -138,7 +138,7 @@ EXTRA_DIST += sys-utils/fstrim.timer
 
 if BUILD_DMESG
 bin_PROGRAMS += dmesg
-dist_man_MANS += sys-utils/dmesg.1
+MANPAGES += sys-utils/dmesg.1
 dmesg_SOURCES = sys-utils/dmesg.c lib/monotonic.c
 dmesg_LDADD = $(LDADD) libcommon.la libtcolors.la $(REALTIME_LIBS)
 dmesg_CFLAGS = $(AM_CFLAGS)
@@ -150,20 +150,20 @@ endif
 
 if BUILD_CTRLALTDEL
 sbin_PROGRAMS += ctrlaltdel
-dist_man_MANS += sys-utils/ctrlaltdel.8
+MANPAGES += sys-utils/ctrlaltdel.8
 ctrlaltdel_SOURCES = sys-utils/ctrlaltdel.c
 ctrlaltdel_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_FSFREEZE
 sbin_PROGRAMS += fsfreeze
-dist_man_MANS += sys-utils/fsfreeze.8
+MANPAGES += sys-utils/fsfreeze.8
 fsfreeze_SOURCES = sys-utils/fsfreeze.c
 endif
 
 if BUILD_BLKDISCARD
 sbin_PROGRAMS += blkdiscard
-dist_man_MANS += sys-utils/blkdiscard.8
+MANPAGES += sys-utils/blkdiscard.8
 blkdiscard_SOURCES = sys-utils/blkdiscard.c lib/monotonic.c
 blkdiscard_LDADD = $(LDADD) libblkid.la libcommon.la $(REALTIME_LIBS)
 blkdiscard_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
@@ -171,28 +171,28 @@ endif
 
 if BUILD_BLKZONE
 sbin_PROGRAMS += blkzone
-dist_man_MANS += sys-utils/blkzone.8
+MANPAGES += sys-utils/blkzone.8
 blkzone_SOURCES = sys-utils/blkzone.c
 blkzone_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_LDATTACH
 usrsbin_exec_PROGRAMS += ldattach
-dist_man_MANS += sys-utils/ldattach.8
+MANPAGES += sys-utils/ldattach.8
 ldattach_SOURCES = sys-utils/ldattach.c
 ldattach_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_RTCWAKE
 usrsbin_exec_PROGRAMS += rtcwake
-dist_man_MANS += sys-utils/rtcwake.8
+MANPAGES += sys-utils/rtcwake.8
 rtcwake_SOURCES = sys-utils/rtcwake.c
 rtcwake_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_SETARCH
 usrbin_exec_PROGRAMS += setarch
-dist_man_MANS += sys-utils/setarch.8
+MANPAGES += sys-utils/setarch.8
 setarch_SOURCES = sys-utils/setarch.c
 
 SETARCH_LINKS = uname26 linux32 linux64
@@ -251,13 +251,13 @@ usrbin_exec_PROGRAMS += eject
 eject_SOURCES =  sys-utils/eject.c lib/monotonic.c
 eject_LDADD = $(LDADD) libmount.la libcommon.la $(REALTIME_LIBS)
 eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
-dist_man_MANS += sys-utils/eject.1
+MANPAGES += sys-utils/eject.1
 endif
 
 
 if BUILD_LOSETUP
 sbin_PROGRAMS += losetup
-dist_man_MANS += sys-utils/losetup.8
+MANPAGES += sys-utils/losetup.8
 losetup_SOURCES = sys-utils/losetup.c
 losetup_LDADD = $(LDADD) libcommon.la libsmartcols.la
 losetup_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
@@ -274,7 +274,7 @@ endif # BUILD_LOSETUP
 
 if BUILD_ZRAMCTL
 sbin_PROGRAMS += zramctl
-dist_man_MANS += sys-utils/zramctl.8
+MANPAGES += sys-utils/zramctl.8
 zramctl_SOURCES = sys-utils/zramctl.c \
                  lib/ismounted.c
 zramctl_LDADD = $(LDADD) libcommon.la libsmartcols.la
@@ -284,7 +284,7 @@ endif
 
 if BUILD_PRLIMIT
 usrbin_exec_PROGRAMS += prlimit
-dist_man_MANS += sys-utils/prlimit.1
+MANPAGES += sys-utils/prlimit.1
 prlimit_SOURCES = sys-utils/prlimit.c
 prlimit_LDADD = $(LDADD) libcommon.la libsmartcols.la
 prlimit_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
@@ -293,7 +293,7 @@ endif
 
 if BUILD_LSNS
 usrbin_exec_PROGRAMS += lsns
-dist_man_MANS += sys-utils/lsns.8
+MANPAGES += sys-utils/lsns.8
 lsns_SOURCES = sys-utils/lsns.c
 lsns_LDADD = $(LDADD) libcommon.la libsmartcols.la libmount.la
 lsns_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) -I$(ul_libmount_incdir)
@@ -302,7 +302,7 @@ endif
 
 if BUILD_MOUNT
 bin_PROGRAMS += mount umount
-dist_man_MANS += \
+MANPAGES += \
        sys-utils/mount.8 \
        sys-utils/fstab.5 \
        sys-utils/umount.8
@@ -352,9 +352,8 @@ endif # BUILD_MOUNT
 
 if BUILD_SWAPON
 sbin_PROGRAMS += swapon swapoff
-dist_man_MANS += \
-       sys-utils/swapon.8 \
-       sys-utils/swapoff.8
+MANPAGES += sys-utils/swapon.8
+MANLINKS += sys-utils/swapoff.8
 
 swapon_SOURCES = \
        sys-utils/swapon.c \
@@ -399,19 +398,19 @@ lscpu_SOURCES = sys-utils/lscpu.c \
                sys-utils/lscpu.h
 lscpu_LDADD = $(LDADD) libcommon.la libsmartcols.la $(RTAS_LIBS)
 lscpu_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
-dist_man_MANS += sys-utils/lscpu.1
+MANPAGES += sys-utils/lscpu.1
 endif
 
 if BUILD_CHCPU
 sbin_PROGRAMS += chcpu
 chcpu_SOURCES = sys-utils/chcpu.c
 chcpu_LDADD = $(LDADD) libcommon.la
-dist_man_MANS += sys-utils/chcpu.8
+MANPAGES += sys-utils/chcpu.8
 endif
 
 if BUILD_WDCTL
 bin_PROGRAMS += wdctl
-dist_man_MANS += sys-utils/wdctl.8
+MANPAGES += sys-utils/wdctl.8
 wdctl_SOURCES = sys-utils/wdctl.c
 wdctl_LDADD = $(LDADD) libcommon.la libsmartcols.la
 wdctl_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
@@ -421,7 +420,7 @@ if BUILD_MOUNTPOINT
 bin_PROGRAMS += mountpoint
 mountpoint_LDADD = $(LDADD) libmount.la
 mountpoint_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
-dist_man_MANS += sys-utils/mountpoint.1
+MANPAGES += sys-utils/mountpoint.1
 mountpoint_SOURCES = sys-utils/mountpoint.c
 endif
 
@@ -429,24 +428,24 @@ if BUILD_FALLOCATE
 usrbin_exec_PROGRAMS += fallocate
 fallocate_SOURCES = sys-utils/fallocate.c
 fallocate_LDADD = $(LDADD) libcommon.la
-dist_man_MANS += sys-utils/fallocate.1
+MANPAGES += sys-utils/fallocate.1
 endif
 
 if BUILD_PIVOT_ROOT
 sbin_PROGRAMS += pivot_root
-dist_man_MANS += sys-utils/pivot_root.8
+MANPAGES += sys-utils/pivot_root.8
 pivot_root_SOURCES = sys-utils/pivot_root.c
 endif
 
 if BUILD_SWITCH_ROOT
 sbin_PROGRAMS += switch_root
-dist_man_MANS += sys-utils/switch_root.8
+MANPAGES += sys-utils/switch_root.8
 switch_root_SOURCES = sys-utils/switch_root.c
 endif
 
 if BUILD_UNSHARE
 usrbin_exec_PROGRAMS += unshare
-dist_man_MANS += sys-utils/unshare.1
+MANPAGES += sys-utils/unshare.1
 unshare_SOURCES = sys-utils/unshare.c \
                  lib/caputils.c \
                  lib/exec_shell.c
@@ -464,7 +463,7 @@ endif
 
 if BUILD_NSENTER
 usrbin_exec_PROGRAMS += nsenter
-dist_man_MANS += sys-utils/nsenter.1
+MANPAGES += sys-utils/nsenter.1
 nsenter_SOURCES = sys-utils/nsenter.c lib/exec_shell.c
 nsenter_LDADD = $(LDADD) libcommon.la $(SELINUX_LIBS)
 
@@ -478,7 +477,7 @@ endif
 
 if BUILD_HWCLOCK
 sbin_PROGRAMS += hwclock
-dist_man_MANS += \
+MANPAGES += \
        sys-utils/hwclock.8 \
        sys-utils/adjtime_config.5
 hwclock_SOURCES = \
@@ -507,7 +506,7 @@ endif # BUILD_HWCLOCK
 
 if BUILD_SETPRIV
 usrbin_exec_PROGRAMS += setpriv
-dist_man_MANS += sys-utils/setpriv.1
+MANPAGES += sys-utils/setpriv.1
 setpriv_SOURCES = sys-utils/setpriv.c \
                  lib/caputils.c
 setpriv_LDADD = $(LDADD) -lcap-ng libcommon.la

diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index c424dbdf84f4acc60adc43d52f12c5ab04c7dfb4..509833e2fcac00de77c7fd3878d40049e6d42092 100644 (file)
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -1,6 +1,6 @@
 if BUILD_SCRIPT
 usrbin_exec_PROGRAMS += script
-dist_man_MANS += term-utils/script.1
+MANPAGES += term-utils/script.1
 script_SOURCES = term-utils/script.c \
                 lib/pty-session.c \
                 include/pty-session.h \
@@ -19,7 +19,7 @@ endif # BUILD_SCRIPT
 
 if BUILD_SCRIPTREPLAY
 usrbin_exec_PROGRAMS += scriptreplay
-dist_man_MANS += term-utils/scriptreplay.1
+MANPAGES += term-utils/scriptreplay.1
 scriptreplay_SOURCES = term-utils/scriptreplay.c \
                       term-utils/script-playutils.c \
                       term-utils/script-playutils.h
@@ -28,7 +28,7 @@ endif # BUILD_SCRIPTREPLAY
 
 if BUILD_SCRIPTLIVE
 usrbin_exec_PROGRAMS += scriptlive
-dist_man_MANS += term-utils/scriptlive.1
+MANPAGES += term-utils/scriptlive.1
 scriptlive_SOURCES = term-utils/scriptlive.c \
                       term-utils/script-playutils.c \
                       term-utils/script-playutils.h \
@@ -41,7 +41,7 @@ endif # BUILD_SCRIPTLIVE
 
 if BUILD_AGETTY
 sbin_PROGRAMS += agetty
-dist_man_MANS += term-utils/agetty.8
+MANPAGES += term-utils/agetty.8
 agetty_SOURCES = term-utils/agetty.c
 if USE_PLYMOUTH_SUPPORT
 agetty_SOURCES += lib/plymouth-ctrl.c
@@ -55,7 +55,7 @@ endif # BUILD_AGETTY
 
 if BUILD_SETTERM
 usrbin_exec_PROGRAMS += setterm
-dist_man_MANS += term-utils/setterm.1
+MANPAGES += term-utils/setterm.1
 setterm_SOURCES = term-utils/setterm.c
 setterm_CFLAGS = $(AM_CFLAGS)
 setterm_LDADD = $(LDADD) libcommon.la
@@ -72,7 +72,7 @@ endif
 if BUILD_MESG
 usrbin_exec_PROGRAMS += mesg
 mesg_LDADD = $(LDADD) libcommon.la
-dist_man_MANS += term-utils/mesg.1
+MANPAGES += term-utils/mesg.1
 mesg_SOURCES = term-utils/mesg.c
 endif
 
@@ -83,7 +83,7 @@ wall_SOURCES = \
        term-utils/wall.c \
        term-utils/ttymsg.c \
        term-utils/ttymsg.h
-dist_man_MANS += term-utils/wall.1
+MANPAGES += term-utils/wall.1
 wall_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 wall_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 wall_LDADD = $(LDADD) libcommon.la
@@ -101,7 +101,7 @@ endif # BUILD_WALL
 
 if BUILD_WRITE
 usrbin_exec_PROGRAMS += write
-dist_man_MANS += term-utils/write.1
+MANPAGES += term-utils/write.1
 write_SOURCES = term-utils/write.c
 write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)

diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index 6c4b5208260d2fff5af3fdebc3fc66e7a265243f..521ab97d1aa345293c1384fc88f8b1c70d79a4ae 100644 (file)
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -1,26 +1,26 @@
 if BUILD_COL
 usrbin_exec_PROGRAMS += col
-dist_man_MANS += text-utils/col.1
+MANPAGES += text-utils/col.1
 col_SOURCES = text-utils/col.c
 col_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_COLCRT
 usrbin_exec_PROGRAMS += colcrt
-dist_man_MANS += text-utils/colcrt.1
+MANPAGES += text-utils/colcrt.1
 colcrt_SOURCES = text-utils/colcrt.c
 endif
 
 if BUILD_COLRM
 usrbin_exec_PROGRAMS += colrm
-dist_man_MANS += text-utils/colrm.1
+MANPAGES += text-utils/colrm.1
 colrm_SOURCES = text-utils/colrm.c
 colrm_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_COLUMN
 usrbin_exec_PROGRAMS += column
-dist_man_MANS += text-utils/column.1
+MANPAGES += text-utils/column.1
 column_SOURCES = text-utils/column.c
 column_LDADD = $(LDADD) libcommon.la libsmartcols.la
 column_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
@@ -28,7 +28,7 @@ endif
 
 if BUILD_HEXDUMP
 usrbin_exec_PROGRAMS += hexdump
-dist_man_MANS += text-utils/hexdump.1
+MANPAGES += text-utils/hexdump.1
 hexdump_SOURCES = \
        text-utils/hexdump-conv.c \
        text-utils/hexdump-display.c \
@@ -40,19 +40,19 @@ endif
 
 if BUILD_REV
 usrbin_exec_PROGRAMS += rev
-dist_man_MANS += text-utils/rev.1
+MANPAGES += text-utils/rev.1
 rev_SOURCES = text-utils/rev.c
 endif
 
 if BUILD_LINE
 usrbin_exec_PROGRAMS += line
 line_SOURCES = text-utils/line.c
-dist_man_MANS += text-utils/line.1
+MANPAGES += text-utils/line.1
 endif
 
 if BUILD_PG
 usrbin_exec_PROGRAMS += pg
-dist_man_MANS += text-utils/pg.1
+MANPAGES += text-utils/pg.1
 pg_SOURCES = text-utils/pg.c
 pg_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) $(NCURSES_CFLAGS) $(TINFO_CFLAGS)
 pg_LDADD = $(LDADD) libcommon.la $(NCURSES_LIBS) $(TINFO_LIBS)
@@ -61,7 +61,7 @@ endif # BUILD_PG
 
 if BUILD_UL
 usrbin_exec_PROGRAMS += ul
-dist_man_MANS += text-utils/ul.1
+MANPAGES += text-utils/ul.1
 ul_SOURCES = text-utils/ul.c
 ul_CFLAGS = $(AM_CFLAGS)
 ul_LDADD = $(LDADD)
@@ -77,7 +77,7 @@ endif # BUILD_UL
 
 if BUILD_MORE
 bin_PROGRAMS += more
-dist_man_MANS += text-utils/more.1
+MANPAGES += text-utils/more.1
 more_SOURCES = text-utils/more.c
 more_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS)
 more_LDADD = $(LDADD) $(MAGIC_LIBS) libcommon.la