From c571a0a19414ad97fe0802868a279c616f30b7de Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Jan 2012 17:26:36 +0100 Subject: [PATCH] util-linux: move shlibs to /usr/lib. --- srcpkgs/util-linux/libblkid.template | 10 +++------- srcpkgs/util-linux/libmount.template | 9 +++------ srcpkgs/util-linux/libuuid.template | 9 +++------ srcpkgs/util-linux/template | 1 + 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/srcpkgs/util-linux/libblkid.template b/srcpkgs/util-linux/libblkid.template index 6bea75d60ed..6a9ae99712e 100644 --- a/srcpkgs/util-linux/libblkid.template +++ b/srcpkgs/util-linux/libblkid.template @@ -1,15 +1,11 @@ # Template file for 'libblkid'. # -revision=1 +revision=2 short_desc="Library to handle device identification" long_desc=" The libblkid package contains a library to handle device identification and token extraction." -Add_dependency run zlib - -do_install() -{ - vmove "lib/libblkid.so*" lib - vmove usr/lib/libblkid.so usr/lib +do_install() { + vmove "usr/lib/libblkid.so*" usr/lib } diff --git a/srcpkgs/util-linux/libmount.template b/srcpkgs/util-linux/libmount.template index d8e3e274cdb..c3e3033e57d 100644 --- a/srcpkgs/util-linux/libmount.template +++ b/srcpkgs/util-linux/libmount.template @@ -1,15 +1,12 @@ # Template file for 'libmount'. # -revision=1 +revision=2 short_desc="A mount(8) library" long_desc=" This NEW LIBRARY is designed to be used in low-level utils like mount(8) and /sbin/mount.<type> helpers as well as in some other projects." - -do_install() -{ - vmove "lib/libmount.so*" lib - vmove usr/lib/libmount.so usr/lib +do_install() { + vmove "usr/lib/libmount.so*" usr/lib } diff --git a/srcpkgs/util-linux/libuuid.template b/srcpkgs/util-linux/libuuid.template index 373b2a075d7..008315706e5 100644 --- a/srcpkgs/util-linux/libuuid.template +++ b/srcpkgs/util-linux/libuuid.template @@ -1,14 +1,11 @@ # Template file for 'libuuid'. # -revision=2 +revision=3 short_desc="UUID library" long_desc=" libuuid generates and parses 128-bit universally unique id's (UUIDs). See RFC 4122 for more information." - -do_install() -{ - vmove "lib/libuuid.so*" lib - vmove usr/lib/libuuid.so usr/lib +do_install() { + vmove "usr/lib/libuuid.so*" usr/lib } diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 18061c11d52..6635d931e23 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -27,6 +27,7 @@ Add_dependency build ncurses-devel do_configure() { ./configure ${CONFIGURE_SHARED_ARGS} \ + --libdir=/usr/lib --libexecdir=/usr/lib \ --enable-partx --enable-write \ --enable-libuuid --disable-makeinstall-chown \ --enable-libblkid --enable-fsck --disable-rpath \