From a3ca3a44c552888a9d898ce2a8cf37fee61b9861 Mon Sep 17 00:00:00 2001
From: Stepan Kasal <skasal@redhat.com>
Date: Tue, 4 Dec 2007 19:21:46 +0100
Subject: [PATCH] build-sys: use dist_man_MANS instead of man_MANS

Signed-off-by: Stepan Kasal <skasal@redhat.com>
---
 config/include-Makefile.am |  2 +-
 disk-utils/Makefile.am     |  8 ++++----
 fdisk/Makefile.am          |  8 ++++----
 getopt/Makefile.am         |  2 +-
 hwclock/Makefile.am        |  2 +-
 login-utils/Makefile.am    | 14 +++++++-------
 misc-utils/Makefile.am     | 12 ++++++------
 mount/Makefile.am          |  4 ++--
 partx/Makefile.am          |  2 +-
 schedutils/Makefile.am     |  6 +++---
 sys-utils/Makefile.am      | 10 +++++-----
 text-utils/Makefile.am     |  6 +++---
 12 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 59f40b97..f9c2409d 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -10,4 +10,4 @@ AM_CFLAGS = -fsigned-char
 # Unlike with other dist primaries, the files are not distributed if the
 # conditional is false.
 # Work the bug around until it is fixed:
-dist_noinst_DATA = $(man_MANS)
+dist_noinst_DATA = $(dist_man_MANS)
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 71735360..8f80624a 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 utils_common = ../lib/linux_version.c ../lib/blkdev.c
 
-man_MANS = blockdev.8 isosize.8 mkfs.8 mkswap.8 \
+dist_man_MANS = blockdev.8 isosize.8 mkfs.8 mkswap.8 \
            fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
 
 sbin_PROGRAMS = mkfs mkswap blockdev fsck.minix mkfs.minix mkfs.bfs
@@ -15,20 +15,20 @@ blockdev_SOURCES = blockdev.c $(utils_common)
 usrbinexec_PROGRAMS = isosize
 
 if LINUX
-man_MANS += fdformat.8
+dist_man_MANS += fdformat.8
 usrbinexec_PROGRAMS += fdformat
 endif
 
 if BUILD_ELVTUNE
 sbin_PROGRAMS += elvtune
-man_MANS += elvtune.8
+dist_man_MANS += elvtune.8
 elvtune_SOURCES = elvtune.c ../lib/linux_version.c
 endif
 
 if HAVE_RAW
 if BUILD_RAW
 sbin_PROGRAMS += raw
-man_MANS += raw.8
+dist_man_MANS += raw.8
 endif
 endif
 
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
index 7e44569e..22467021 100644
--- a/fdisk/Makefile.am
+++ b/fdisk/Makefile.am
@@ -8,7 +8,7 @@ fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \
 if !ARCH_M68K
 
 sbin_PROGRAMS = fdisk
-man_MANS = fdisk.8
+dist_man_MANS = fdisk.8
 fdisk_SOURCES = fdisk.c fdiskbsdlabel.c fdisksgilabel.c \
 	fdisksunlabel.c fdiskaixlabel.c fdiskmaclabel.c partname.c \
 	fdisk.h fdisksunlabel.h fdisksgilabel.h fdiskaixlabel.h \
@@ -17,18 +17,18 @@ fdisk_SOURCES = fdisk.c fdiskbsdlabel.c fdisksgilabel.c \
 if !ARCH_SPARC
 
 sbin_PROGRAMS += sfdisk
-man_MANS += sfdisk.8
+dist_man_MANS += sfdisk.8
 sfdisk_SOURCES = sfdisk.c partname.c $(fdisk_common)
 
 if USE_SLANG
 sbin_PROGRAMS += cfdisk
-man_MANS += cfdisk.8
+dist_man_MANS += cfdisk.8
 cfdisk_SOURCES = cfdisk.c $(fdisk_common)
 cfdisk_LDADD = -lslang
 else
 if HAVE_NCURSES
 sbin_PROGRAMS += cfdisk
-man_MANS += cfdisk.8
+dist_man_MANS += cfdisk.8
 cfdisk_SOURCES = cfdisk.c $(fdisk_common)
 cfdisk_LDADD = -lncurses
 endif
diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index 03388421..644d6411 100644
--- a/getopt/Makefile.am
+++ b/getopt/Makefile.am
@@ -4,7 +4,7 @@ usrbinexec_PROGRAMS = getopt
 
 getopt_CPPFLAGS = -DLIBCGETOPT=1 $(AM_CPPFLAGS)
 
-man_MANS = getopt.1
+dist_man_MANS = getopt.1
 
 exampledir = $(datadir)/getopt/
 dist_example_SCRIPTS = getopt-parse.bash getopt-parse.tcsh \
diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am
index dac1541c..542521c7 100644
--- a/hwclock/Makefile.am
+++ b/hwclock/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-man_MANS = hwclock.8
+dist_man_MANS = hwclock.8
 
 sbin_PROGRAMS = hwclock
 
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index de45f26f..8f5dc894 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -4,19 +4,19 @@ bin_PROGRAMS =
 usrbinexec_PROGRAMS =
 sbin_PROGRAMS =
 usrsbinexec_PROGRAMS =
-man_MANS =
+dist_man_MANS =
 
 EXTRA_DIST = README.getty  README.modems-with-agetty  README.poeigl
 
 if BUILD_AGETTY
 sbin_PROGRAMS += agetty
-man_MANS += agetty.8
+dist_man_MANS += agetty.8
 endif
 
 if BUILD_INIT
 
 sbin_PROGRAMS += simpleinit shutdown initctl
-man_MANS += fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \
+dist_man_MANS += fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \
 	initctl.8
 
 simpleinit_SOURCES = simpleinit.c my_crypt.h simpleinit.h
@@ -30,7 +30,7 @@ endif
 
 if BUILD_LAST
 usrbinexec_PROGRAMS += last
-man_MANS += last.1
+dist_man_MANS += last.1
 endif
 
 if BUILD_LOGIN_UTILS
@@ -38,7 +38,7 @@ if BUILD_LOGIN_UTILS
 bin_PROGRAMS += login
 usrbinexec_PROGRAMS += chfn chsh newgrp
 usrsbinexec_PROGRAMS += vipw
-man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
+dist_man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
 
 chfn_SOURCES = chfn.c $(chfn_chsh_common)
 chsh_SOURCES = chsh.c $(chfn_chsh_common)
@@ -97,13 +97,13 @@ endif
 
 if BUILD_MESG
 usrbinexec_PROGRAMS += mesg
-man_MANS += mesg.1
+dist_man_MANS += mesg.1
 endif
 
 if BUILD_WALL
 usrbinexec_PROGRAMS += wall
 wall_SOURCES = wall.c ttymsg.c ttymsg.h
-man_MANS += wall.1
+dist_man_MANS += wall.1
 
 if USE_TTY_GROUP
 if MAKEINSTALL_DO_CHOWN
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index e01f586a..b799462c 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -14,7 +14,7 @@ usrbinexec_SCRIPTS = chkdupexe scriptreplay
 
 CLEANFILES = chkdupexe scriptreplay
 
-man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
+dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
 	namei.1 script.1 whereis.1 scriptreplay.1
 
 if HAVE_TINFO
@@ -36,7 +36,7 @@ endif
 if HAVE_NCURSES
 if LINUX
 usrbinexec_PROGRAMS += setterm
-man_MANS += setterm.1
+dist_man_MANS += setterm.1
 endif
 if HAVE_TINFO
 setterm_LDADD = -ltinfo
@@ -48,24 +48,24 @@ endif
 if BUILD_KILL
 bin_PROGRAMS += kill
 kill_SOURCES = kill.c procs.c kill.h
-man_MANS += kill.1
+dist_man_MANS += kill.1
 endif
 
 if BUILD_RENAME
 usrbinexec_PROGRAMS += rename
-man_MANS += rename.1
+dist_man_MANS += rename.1
 endif
 
 if BUILD_RESET
 dist_usrbinexec_SCRIPTS = reset
-man_MANS += reset.1
+dist_man_MANS += reset.1
 endif
 EXTRA_DIST += README.reset reset.033c
 
 if BUILD_WRITE
 
 usrbinexec_PROGRAMS += write
-man_MANS += write.1
+dist_man_MANS += write.1
 write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 
diff --git a/mount/Makefile.am b/mount/Makefile.am
index 6efc7554..bba59626 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = README.mount
 
 bin_PROGRAMS = mount umount
 sbin_PROGRAMS = losetup swapon
-man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
+dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
 
 utils_common = sundries.c xmalloc.c realpath.c fsprobe.c
 
@@ -53,7 +53,7 @@ endif
 
 if HAVE_PIVOT_ROOT
 sbin_PROGRAMS += pivot_root
-man_MANS += pivot_root.8
+dist_man_MANS += pivot_root.8
 endif
 
 noinst_PROGRAMS = mtab_lock_test
diff --git a/partx/Makefile.am b/partx/Makefile.am
index 461392a4..798cfea7 100644
--- a/partx/Makefile.am
+++ b/partx/Makefile.am
@@ -6,6 +6,6 @@ usrsbinexec_PROGRAMS = addpart delpart partx
 partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c \
 		efi.h gpt.h crc32.h partx.h dos.h
 
-man_MANS = addpart.8 delpart.8 partx.8
+dist_man_MANS = addpart.8 delpart.8 partx.8
 
 endif
diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am
index 81a734e9..0c14e51a 100644
--- a/schedutils/Makefile.am
+++ b/schedutils/Makefile.am
@@ -3,18 +3,18 @@ include $(top_srcdir)/config/include-Makefile.am
 if BUILD_SCHEDUTILS
 
 usrbinexec_PROGRAMS = chrt
-man_MANS = chrt.1
+dist_man_MANS = chrt.1
 
 if HAVE_IOPRIO_GET
 if HAVE_IOPRIO_SET
 usrbinexec_PROGRAMS += ionice
-man_MANS += ionice.1
+dist_man_MANS += ionice.1
 endif
 endif
 
 if HAVE_SCHED_GETAFFINITY
 usrbinexec_PROGRAMS += taskset
-man_MANS += taskset.1
+dist_man_MANS += taskset.1
 endif
 
 endif
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index 7d5195a1..2c814dcb 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -23,7 +23,7 @@ endif
 
 tunelp_SOURCES = tunelp.c lp.h
 
-man_MANS = flock.1 readprofile.1 \
+dist_man_MANS = flock.1 readprofile.1 \
 	ctrlaltdel.8 cytune.8 dmesg.1 ipcrm.1 ipcs.1 renice.1 \
 	setsid.1 tunelp.8 setarch.8 rtcwake.8
 
@@ -31,7 +31,7 @@ info_TEXINFOS = ipc.texi
 
 if BUILD_ARCH
 bin_PROGRAMS += arch
-man_MANS += arch.1
+dist_man_MANS += arch.1
 endif
 
 
@@ -41,12 +41,12 @@ rdev_common_links = ramsize vidmode rootflags
 
 if ARCH_I86
 usrsbinexec_PROGRAMS += rdev
-man_MANS += $(rdev_common_mans)
+dist_man_MANS += $(rdev_common_mans)
 RDEV_LINKS = $(rdev_common_links)
 endif
 if ARCH_86_64
 usrsbinexec_PROGRAMS += rdev
-man_MANS += $(rdev_common_mans)
+dist_man_MANS += $(rdev_common_mans)
 RDEV_LINKS = $(rdev_common_links)
 endif
 
@@ -81,7 +81,7 @@ SETARCH_LINKS += parisc parisc64 parisc32
 endif
 
 SETARCH_MAN_LINKS = $(addsuffix .8, $(SETARCH_LINKS))
-man_MANS += $(SETARCH_MAN_LINKS)
+dist_man_MANS += $(SETARCH_MAN_LINKS)
 CLEANFILES=$(SETARCH_MAN_LINKS)
 
 $(SETARCH_MAN_LINKS): setarch.8
diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am
index 7c9e9064..d93af727 100644
--- a/text-utils/Makefile.am
+++ b/text-utils/Makefile.am
@@ -7,7 +7,7 @@ usrbinexec_PROGRAMS = col colcrt colrm column hexdump rev line tailf
 hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c odsyntax.c parse.c \
 		  hexdump.h
 
-man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
+dist_man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
 
 if HAVE_NCURSES
 bin_PROGRAMS = more
@@ -21,12 +21,12 @@ more_LDADD = -lncurses
 pg_LDADD = -lncurses
 ul_LDADD = -lncurses
 endif
-man_MANS += ul.1 more.1 pg.1
+dist_man_MANS += ul.1 more.1 pg.1
 else
 if HAVE_TERMCAP
 bin_PROGRAMS = more
 more_LDADD = -ltermcap
-man_MANS += more.1
+dist_man_MANS += more.1
 endif
 endif
 
-- 
2.39.5