build-sys: simplify code around RDEV_LINKS and SETARCH_LINKS

Signed-off-by: Stepan Kasal <skasal@redhat.com>

diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index 056f8e1fc6bac5775e9a666043d78305933e45b8..8c837e8f24dae1deed4c0ca33aa5f5cdaeb2fd89 100644 (file)
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -35,21 +35,11 @@ dist_man_MANS += arch.1
 endif
 
 
+RDEV_LINKS =
 if BUILD_RDEV
-rdev_common_mans = rdev.8 ramsize.8 rootflags.8 vidmode.8
-rdev_common_links = ramsize vidmode rootflags
-
-if ARCH_I86
-usrsbinexec_PROGRAMS += rdev
-dist_man_MANS += $(rdev_common_mans)
-RDEV_LINKS = $(rdev_common_links)
-endif
-if ARCH_86_64
 usrsbinexec_PROGRAMS += rdev
-dist_man_MANS += $(rdev_common_mans)
-RDEV_LINKS = $(rdev_common_links)
-endif
-
+RDEV_LINKS += ramsize vidmode rootflags
+dist_man_MANS += rdev.8
 endif
 
 
@@ -80,9 +70,13 @@ if ARCH_HPPA
 SETARCH_LINKS += parisc parisc64 parisc32
 endif
 
+RDEV_MAN_LINKS = $(RDEV_LINKS:=.8)
 SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8)
-dist_man_MANS += $(SETARCH_MAN_LINKS)
-CLEANFILES=$(SETARCH_MAN_LINKS)
+man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS)
+CLEANFILES = $(man_MANS)
+
+$(RDEV_MAN_LINKS): rdev.8
+       echo ".so rdev.8" > $@
 
 $(SETARCH_MAN_LINKS): setarch.8
        echo ".so setarch.8" > $@

diff --git a/sys-utils/ramsize.8 b/sys-utils/ramsize.8
deleted file mode 100644 (file)
index 901bd75..0000000
--- a/sys-utils/ramsize.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/rdev.8

diff --git a/sys-utils/rootflags.8 b/sys-utils/rootflags.8
deleted file mode 100644 (file)
index 901bd75..0000000
--- a/sys-utils/rootflags.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/rdev.8

diff --git a/sys-utils/vidmode.8 b/sys-utils/vidmode.8
deleted file mode 100644 (file)
index 901bd75..0000000
--- a/sys-utils/vidmode.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/rdev.8