Merge commit 'origin/stable/v2.13' into stable/v2.13

diff --cc sys-utils/Makefile.am
index 3e2f7b6b733504ae875673584a86a459fec21e89,4ef94d4d37ece82603f43546bcec1597983d37cb..dd637b124fd5dd47572818438f19eca990c6f5f7
--- 1/sys-utils/Makefile.am
--- 2/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@@ -75,9 -82,13 +82,14 @@@ install-exec-hook
        done
        for I in $(SETARCH_LINKS); do \
                cd $(DESTDIR)$(usrbinexecdir) && ln -sf setarch $$I ; \
 +              cd $(DESTDIR)$(man8dir) && ln -sf ../man8/setarch.8 $${I}.8; \
        done
+ 
+ uninstall-hook:
+       for I in $(RDEV_LINKS); do \
+               rm -f $(DESTDIR)$(usrbinexecdir)/$$I ; \
+       done
        for I in $(SETARCH_LINKS); do \
-                 echo ".so setarch.8" > $(DESTDIR)$(man8dir)/$$I.8 ; \
-         done
+               rm -f $(DESTDIR)$(usrbinexecdir)/$$I ; \
+       done