From f906fd4d75cca59e4319c33a5aca409d3104952b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 2 Jun 2015 09:36:06 +0200 Subject: [PATCH] util-linux: move to usr/bin. --- srcpkgs/util-linux/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index b68fcc6c01..b2b83468c8 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,7 +1,7 @@ # Template file for 'util-linux' pkgname=util-linux version=2.26.2 -revision=2 +revision=3 short_desc="Miscellaneous linux utilities" maintainer="Juan RP " homepage="http://userweb.kernel.org/~kzak/util-linux-ng" @@ -29,7 +29,7 @@ pre_configure() { do_configure() { ./configure ${configure_args} \ --exec-prefix=/usr --libdir=/usr/lib \ - --bindir=/usr/bin --sbindir=/usr/sbin \ + --bindir=/usr/bin --sbindir=/usr/bin \ --enable-libuuid --disable-makeinstall-chown \ --enable-libblkid --enable-fsck --disable-rpath \ --enable-fs-paths-extra=/usr/sbin:/usr/bin \ @@ -39,12 +39,10 @@ do_configure() { --enable-write --localstatedir=/run } do_build() { - export CCACHE_DISABLE=1 make ${makejobs} - unset CCACHE_DISABLE } do_install() { - make DESTDIR=${DESTDIR} install + make usrsbin_execdir=/usr/bin DESTDIR=${DESTDIR} install # Correct perms for newgrp, chfn, chsh, wall and write. chmod u+s $DESTDIR/usr/bin/{newgrp,chsh,chfn}