From: LaMont Jones <lamont@debian.org>
Date: Tue, 18 Dec 2007 00:33:43 +0000 (-0700)
Subject: Merge commit 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=019853110d231621bfe63a3daffd7f4ce2622164;p=util-linux

Merge commit 'origin/master'
---

019853110d231621bfe63a3daffd7f4ce2622164
diff --cc sys-utils/Makefile.am
index 22dd88ea,8c837e8f..862e2257
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@@ -80,12 -70,16 +70,16 @@@ if ARCH_HPP
  SETARCH_LINKS += parisc parisc64 parisc32
  endif
  
- SETARCH_MAN_LINKS = $(addsuffix .8, $(SETARCH_LINKS))
- man_MANS += $(SETARCH_MAN_LINKS)
- CLEANFILES=$(SETARCH_MAN_LINKS)
+ RDEV_MAN_LINKS = $(RDEV_LINKS:=.8)
+ SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8)
+ 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" > $@
 +	echo ".so man8/setarch.8" > $@
  
  install-exec-hook:
  	for I in $(RDEV_LINKS); do \