From 62602dc130d852447468c0830871d475a56152e1 Mon Sep 17 00:00:00 2001
From: Lukc <lukc@upyum.com>
Date: Sun, 16 Jan 2011 15:30:50 +0100
Subject: Bibliothèques de uClibc installées pour la plupart dans /lib,
 maintenant. \o/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uclibc/.footprint | 33 +++++++++++++++++----------------
 uclibc/Pkgfile    |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/uclibc/.footprint b/uclibc/.footprint
index 8fdad31..bcddf60 100644
--- a/uclibc/.footprint
+++ b/uclibc/.footprint
@@ -1,3 +1,16 @@
+drwxr-xr-x	root/root	lib/
+-rwxr-xr-x	root/root	lib/ld-uClibc-0.9.31.so
+lrwxrwxrwx	root/root	lib/ld-uClibc.so.0 -> ld-uClibc-0.9.31.so
+lrwxrwxrwx	root/root	lib/libc.so.0 -> libuClibc-0.9.31.so
+-rwxr-xr-x	root/root	lib/libcrypt-0.9.31.so
+lrwxrwxrwx	root/root	lib/libcrypt.so.0 -> libcrypt-0.9.31.so
+-rwxr-xr-x	root/root	lib/libdl-0.9.31.so
+lrwxrwxrwx	root/root	lib/libdl.so.0 -> libdl-0.9.31.so
+-rwxr-xr-x	root/root	lib/libm-0.9.31.so
+lrwxrwxrwx	root/root	lib/libm.so.0 -> libm-0.9.31.so
+-rwxr-xr-x	root/root	lib/librt-0.9.31.so
+lrwxrwxrwx	root/root	lib/librt.so.0 -> librt-0.9.31.so
+-rwxr-xr-x	root/root	lib/libuClibc-0.9.31.so
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/a.out.h
@@ -279,31 +292,19 @@ drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/crt1.o
 -rw-r--r--	root/root	usr/lib/crti.o
 -rw-r--r--	root/root	usr/lib/crtn.o
--rwxr-xr-x	root/root	usr/lib/ld-uClibc-0.9.31.so
-lrwxrwxrwx	root/root	usr/lib/ld-uClibc.so.0 -> ld-uClibc-0.9.31.so
 -rw-r--r--	root/root	usr/lib/libc.a
 -rw-r--r--	root/root	usr/lib/libc.so
-lrwxrwxrwx	root/root	usr/lib/libc.so.0 -> libuClibc-0.9.31.so
 lrwxrwxrwx	root/root	usr/lib/libc_pic.a -> libc.a
--rwxr-xr-x	root/root	usr/lib/libcrypt-0.9.31.so
 -rw-r--r--	root/root	usr/lib/libcrypt.a
-lrwxrwxrwx	root/root	usr/lib/libcrypt.so -> libcrypt.so.0
-lrwxrwxrwx	root/root	usr/lib/libcrypt.so.0 -> libcrypt-0.9.31.so
+lrwxrwxrwx	root/root	usr/lib/libcrypt.so -> ../../lib/libcrypt.so.0
 lrwxrwxrwx	root/root	usr/lib/libcrypt_pic.a -> libcrypt.a
--rwxr-xr-x	root/root	usr/lib/libdl-0.9.31.so
 -rw-r--r--	root/root	usr/lib/libdl.a
-lrwxrwxrwx	root/root	usr/lib/libdl.so -> libdl.so.0
-lrwxrwxrwx	root/root	usr/lib/libdl.so.0 -> libdl-0.9.31.so
+lrwxrwxrwx	root/root	usr/lib/libdl.so -> ../../lib/libdl.so.0
 lrwxrwxrwx	root/root	usr/lib/libdl_pic.a -> libdl.a
--rwxr-xr-x	root/root	usr/lib/libm-0.9.31.so
 -rw-r--r--	root/root	usr/lib/libm.a
-lrwxrwxrwx	root/root	usr/lib/libm.so -> libm.so.0
-lrwxrwxrwx	root/root	usr/lib/libm.so.0 -> libm-0.9.31.so
+lrwxrwxrwx	root/root	usr/lib/libm.so -> ../../lib/libm.so.0
 lrwxrwxrwx	root/root	usr/lib/libm_pic.a -> libm.a
--rwxr-xr-x	root/root	usr/lib/librt-0.9.31.so
 -rw-r--r--	root/root	usr/lib/librt.a
-lrwxrwxrwx	root/root	usr/lib/librt.so -> librt.so.0
-lrwxrwxrwx	root/root	usr/lib/librt.so.0 -> librt-0.9.31.so
+lrwxrwxrwx	root/root	usr/lib/librt.so -> ../../lib/librt.so.0
 lrwxrwxrwx	root/root	usr/lib/librt_pic.a -> librt.a
--rwxr-xr-x	root/root	usr/lib/libuClibc-0.9.31.so
 -rw-r--r--	root/root	usr/lib/uclibc_nonshared.a
diff --git a/uclibc/Pkgfile b/uclibc/Pkgfile
index e96e1dc..74f9884 100644
--- a/uclibc/Pkgfile
+++ b/uclibc/Pkgfile
@@ -44,7 +44,7 @@ function build {
 		sed -i -e "s/^CONFIG_GENERIC_386=y$/# CONFIG_GENERIC_386 is not set/;s/# CONFIG_$UCLIBC_CPU is not set/CONFIG_$UCLIBC_CPU=y/" .config
 	fi
 	# Installation dans un $prefix… standard ?
-	sed -i -e "s:^RUNTIME_PREFIX=.*:RUNTIME_PREFIX=\"$prefix\":" .config
+	sed -i -e "s:^RUNTIME_PREFIX=.*:RUNTIME_PREFIX=\"\":" .config
 	sed -i -e "s:^DEVEL_PREFIX=.*:DEVEL_PREFIX=\"$prefix\":" .config
 	gmake CROSS=${UCLIBC_CROSS} DESTDIR=$PKG install
 }
-- 
cgit v1.2.3-54-g00ecf