From f80afdb5fca2b55fc041811c2e642cef82ebc7e5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 2 Jun 2015 10:42:02 +0200 Subject: [PATCH] shadow: move to usr/bin. --- srcpkgs/shadow/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index b0ece610c80..63095f47ec6 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -1,10 +1,10 @@ # Template file for 'shadow' pkgname=shadow version=4.2.1 -revision=9 +revision=10 build_pie=yes build_style=gnu-configure -configure_args="--bindir=/usr/bin --sbindir=/usr/sbin +configure_args="--bindir=/usr/bin --sbindir=/usr/bin --libdir=/usr/lib --enable-shared --disable-static --with-libpam --without-selinux --with-acl --with-attr --disable-nls --enable-subordinate-ids ac_cv_id32bit=yes" @@ -50,6 +50,8 @@ do_build() { make ${makejobs} } post_install() { + mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin + # Install our pam files not the ones supplied with shadow. rm -f ${DESTDIR}/etc/pam.d/* for f in chage passwd; do @@ -80,7 +82,7 @@ post_install() { rm \ $DESTDIR/usr/bin/{login,su,chsh,chfn} \ - $DESTDIR/usr/sbin/{nologin,logoutd,vipw,vigr} + $DESTDIR/usr/bin/{nologin,logoutd,vipw,vigr} # ...and their many man pages find $DESTDIR/usr/share/man \