From 872c3f29ddbbe51a2183cfe0757b9c93f9674f84 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Fri, 12 Aug 2011 19:13:20 +0000
Subject: [PATCH] =?UTF-8?q?Link=20Fehler=20korrigiert=20-=20-k=20flag=20f?=
 =?UTF-8?q?=C3=BCr=20make=20ist=20jetzt=20nicht=20mehr=20noetig.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6160 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/network/pidgin | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/SysBuild/network/pidgin b/SysBuild/network/pidgin
index 40734e6..738a3f7 100644
--- a/SysBuild/network/pidgin
+++ b/SysBuild/network/pidgin
@@ -79,18 +79,12 @@ premk() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
-	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
-	USE_ARCH=$UARCH \
 	CC="gcc $BUILDOPTIONS"  \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	./configure --prefix=/usr/X11R7 \
 		    --sysconfdir=/etc \
-		    $ADDOPTIONS \
+		    --libdir=\${prefix}/${LIBDIR} \
 		    --with-nspr-includes=/opt/firefox/include/firefox/stable \
 		    --with-nspr-libs=/opt/firefox/$LIBDIR/firefox \
 		    --with-nss-includes=/opt/firefox/include/firefox/stable \
@@ -104,10 +98,12 @@ mk() {
 		    --disable-nm
 	if [ "$MK64BIT" == "true" ]; then
 		find . -name "Makefile" -exec sed -i "s%\(DBUS_LIBS = \)-L/lib%\1-L/lib64%" {} \;
+		find . -name "Makefile" -exec sed -i "s%-L/lib %-L/lib64 %g" {} \;
 		find . -name "Makefile" -exec sed -i "s%/usr/X11R7/lib %/usr/X11R7/lib64 %" {} \;
 	fi
-	make -k -j $NUMCPU
-	make -k -j $NUMCPU DESTDIR=$TMPROOT install
+	sed -i "s/\(libgnt\.la\)/\1 -lncursesw /" finch/Makefile
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 	CheckError "Make install process failed !" 1
 }