From 8b6eb20e0ab1ecfad09ee02292ec044e3352e0fb Mon Sep 17 00:00:00 2001
From: fake <fake@rapidnetworks.de>
Date: Wed, 8 Dec 2004 10:27:58 +0000
Subject: [PATCH] fake: 	dietlibc: use only the first bin-* directory 	as a
 source for files, remove a stale directory 	on ppc

[2004120121495222027] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5011 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/dietlibc/dietlibc.conf | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/base/dietlibc/dietlibc.conf b/package/base/dietlibc/dietlibc.conf
index 0161b21c0..4d4ff637a 100644
--- a/package/base/dietlibc/dietlibc.conf
+++ b/package/base/dietlibc/dietlibc.conf
@@ -52,8 +52,8 @@ EOT
 		# dietlibc uses uname - so we always need to set MYARCH
 		eval "$MAKE MYARCH=$cpu $makeopt CC='$CC --specs=specs'"
 		if [ $toolsdir = tools.cross ] ; then
-			cp -v bin-*/diet-i     $toolsbin/diet     || true
-			cp -v bin-*/diet-dyn-i $toolsbin/diet-dyn || true
+			cp -v `ls bin-*/diet-i | head -n 1`     $toolsbin/diet     || true
+			cp -v `ls bin-*/diet-dyn-i | head -n 1` $toolsbin/diet-dyn || true
 		fi
 
 		eval "$MAKE MYARCH=$cpu $makeinstopt CC='$CC --specs=specs'"
@@ -62,8 +62,8 @@ EOT
 
 		eval "$MAKE $makeopt CC=$HOSTCC"
 		if [ $toolsdir = tools.cross ] ; then
-			cp -v bin-*/diet-i     $toolsbin/diet     || true
-			cp -v bin-*/diet-dyn-i $toolsbin/diet-dyn || true
+			cp -v `ls bin-*/diet-i | head -n 1`     $toolsbin/diet     || true
+			cp -v `ls bin-*/diet-dyn-i | head -n 1` $toolsbin/diet-dyn || true
 		fi
 
 		# in the dietlibc Makefile, $CROSS is prepended to $CC
@@ -75,6 +75,10 @@ EOT
 		rm -vf $root/$prefix/dietlibc/lib-powerpc
 		ln -vs lib-ppc $root/$prefix/dietlibc/lib-powerpc
 	fi
+
+	if [ -d $root/$prefix/bin/lib-ppc ] ; then
+		rmdir $root/$prefix/bin/lib-ppc
+	fi
 }
 
 if [ "$prefix" = "usr" -o "$prefix" = "usr/local" ] ; then