From 4ff338342e5445055f8d08d319c39f2b18ef60f7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 9 Jul 2012 16:13:38 +0200
Subject: [PATCH] glibc: switch to /usr.

---
 srcpkgs/glibc/nscd.template |  4 ++--
 srcpkgs/glibc/template      | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/glibc/nscd.template b/srcpkgs/glibc/nscd.template
index 7a81703973..a99e8bf21d 100644
--- a/srcpkgs/glibc/nscd.template
+++ b/srcpkgs/glibc/nscd.template
@@ -9,8 +9,8 @@ long_desc="
 
 do_install() {
 	vmove usr/sbin/nscd usr/sbin
-	vinstall ${FILESDIR}/nscd.service 644 lib/systemd/system
-	vinstall ${FILESDIR}/nscd.socket 644 lib/systemd/system
+	vinstall ${FILESDIR}/nscd.service 644 usr/lib/systemd/system
+	vinstall ${FILESDIR}/nscd.socket 644 usr/lib/systemd/system
 	vinstall ${FILESDIR}/nscd.tmpfiles.d 644 usr/lib/tmpfiles.d nscd.conf
 	vinstall ${FILESDIR}/nscd.conf 644 etc
 	vinstall ${FILESDIR}/nscd.logrotate 644 etc/logrotate.d nscd
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 80661c4297..227c672cfc 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -2,7 +2,7 @@
 pkgname=glibc
 _majorver=2.16
 version=${_majorver}.0
-revision=5
+revision=6
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"
@@ -29,10 +29,11 @@ long_desc="
  languages use the C library to access the underlying operating system."
 
 do_configure() {
-	local cflags
-
 	mkdir build && cd build
-	echo "slibdir=/lib" > configparms
+
+	echo "slibdir=/usr/lib" > configparms
+	echo "bindir=/usr/bin" >> configparms
+	echo "sbindir=/usr/sbin" >> configparms
 
 	# Build with -mno-tls-direct-seg-refs to avoid performance problems
 	# with Xen on x86 32bit.
@@ -41,6 +42,7 @@ do_configure() {
 	fi
 
 	../configure ${CONFIGURE_SHARED_ARGS} --with-tls \
+		--bindir=/usr/bin --sbindir=/usr/sbin \
 		--enable-add-ons=nptl,libidn --enable-obsolete-rpc \
 		--enable-multi-arch --with-__thread \
 		--enable-bind-now --enable-kernel=2.6.27 \
@@ -85,4 +87,7 @@ do_install() {
 	echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
 	chmod 644 ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
 	rm -f ${DESTDIR}/etc/ld.so.cache
+
+	# Switch to /usr.
+	vmove "sbin/*" usr/sbin
 }