X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=tools%2Fmake-functions;h=7bacec10d6d31a815f56fd20a313b35c36950b7c;hp=ebbb4d822e9e7ba1801fafc98ea316994aad8fc3;hb=592efb85b898498361bd0b698cee18ec8dd35041;hpb=db95c207362bbf475c4756f1f3b352cabe75c5e8

diff --git a/tools/make-functions b/tools/make-functions
index ebbb4d822..7bacec10d 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -293,7 +293,7 @@ entershell() {
 	fi
 
 	echo "Entering to a shell inside LFS chroot, go out with exit"
-	$linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
+	chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
 		PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
 		VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \
 		NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
@@ -392,7 +392,6 @@ lfsmake1() {
 						ROOT=$LFS \
 						KVER=$KVER \
 						MAKETUNING=$MAKETUNING \
-						$(fake_environ) \
 						install >> $LOGFILE 2>&1
 	local COMPILE_SUCCESS=$?
 	local PKG_TIME_END=`date +%s`
@@ -412,7 +411,7 @@ lfsmake2() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
+	chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
 						VERSION=$VERSION \
@@ -447,7 +446,7 @@ ipfiremake() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
+	chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
 						VERSION=$VERSION \
@@ -518,7 +517,7 @@ installmake() {
 	[ $? == 1 ] && return 0
 
 	local PKG_TIME_START=`date +%s`
-	$linux32 chroot $LFS /tools/bin/env -i 	HOME=/root \
+	chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
 						VERSION=$VERSION \
@@ -531,8 +530,9 @@ installmake() {
 						CROSSTARGET="${CROSSTARGET}" \
 						MACHINE="$MACHINE" \
 						MACHINE_TYPE="$MACHINE_TYPE" \
-		    /bin/bash -x -c "cd /usr/src/lfs && \
-		    make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
+						LD_LIBRARY_PATH=/tools/lib \
+		    /tools/bin/bash -x -c "cd /usr/src/lfs && \
+		    /tools/bin/make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
 
 	local COMPILE_SUCCESS=$?
 	local PKG_TIME_END=`date +%s`
@@ -555,12 +555,16 @@ update_langs() {
 		$BASEDIR/tools/sort_strings.pl es
 		$BASEDIR/tools/sort_strings.pl pl
 		$BASEDIR/tools/sort_strings.pl ru
+		$BASEDIR/tools/sort_strings.pl nl
+		$BASEDIR/tools/sort_strings.pl tr
 		$BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en
 		$BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
 		$BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr
 		$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es
 		$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl
 		$BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru
+		$BASEDIR/tools/check_strings.pl nl > $BASEDIR/doc/language_issues.nl
+		$BASEDIR/tools/check_strings.pl tr > $BASEDIR/doc/language_issues.tr
 		$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
 		beautify message DONE
 }