util-linux: move shlibs to /usr/lib.

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 "usr/lib/libblkid.so*" usr/lib
-do_install()
-{
-	vmove "lib/libblkid.so*" lib
-	vmove usr/lib/libblkid.so usr/lib
 }

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() {
-do_install()
+	vmove "usr/lib/libmount.so*" usr/lib
-{
-	vmove "lib/libmount.so*" lib
-	vmove usr/lib/libmount.so usr/lib
 }

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() {
-do_install()
+	vmove "usr/lib/libuuid.so*" usr/lib
-{
-	vmove "lib/libuuid.so*" lib
-	vmove usr/lib/libuuid.so usr/lib
 }

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 \