[Devil-linux-commit] build/scripts glibc,1.24,1.25

[<rap...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv11126/scripts

Modified Files:
	glibc 
Log Message:
misc fixes and glitches

Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- glibc	4 Jan 2004 00:03:58 -0000	1.24
+++ glibc	6 Jan 2004 19:26:48 -0000	1.25
@@ -71,24 +71,28 @@
 		make localedata/install-locales install_root=$WORKDIR/tmp || exit 1
 		rm -rf $WORKDIR/tmp/usr/include || exit 1
 		rm -rf $WORKDIR/tmp/usr/info || exit 1
+		cp -dpR $WORKDIR/tmp/usr/lib/locale $CDDIR/usr/lib/ || exit 1
 		rm -rf $WORKDIR/tmp/usr/lib || exit 1
 		rm -rf $WORKDIR/tmp/etc || exit 1
 		rm -rf $WORKDIR/tmp/sbin/sln || exit 1
-		#rm -rf $WORKDIR/tmp/usr/share/i18n/* || exit 1
-		#rm -rf $WORKDIR/tmp/usr/share/locale/* || exit 1
 		cp -dpR $WORKDIR/tmp/usr/share/* $CDDIR/usr/share || exit 1
 		rm -rf $WORKDIR/tmp/usr/share || exit 1
 		cp -dpR $WORKDIR/tmp/{sbin,usr} $CDDIR/ || exit 1
 		rm -rf $WORKDIR/tmp/{sbin,usr} || exit 1
 		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
 		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $CDDIR/usr/lib/locale/ || exit 1
-
-		for i in es_ES fr_FR it_IT nl_NL pt_PT sv_FI de_DE
-		do
-		    echo Generating locale: $i@euro
-		    $CDDIR/usr/bin/localedef --inputfile=$CDDIR/usr/share/i18n/locales/$i@euro -c --charmap=$CDDIR/usr/share/i18n/charmaps/ISO-8859-15 --prefix=$CDDIR $i@euro || echo
-		done
+		
+		#mkdir -p $CDDIR/usr/lib/locale/ || exit 1
+		#for i in es_ES fr_FR it_IT nl_NL pt_PT sv_FI de_DE
+		#do
+		#    echo Generating locale: $i@euro
+		#    $CDDIR/usr/bin/localedef --force --inputfile=$CDDIR/usr/share/i18n/locales/$i@euro -c --charmap=$CDDIR/usr/share/i18n/charmaps/ISO-8859-15 --prefix=$CDDIR $i.ISO-8859-15 || echo
+		#done
+		#for i in es_ES fr_FR it_IT nl_NL pt_PT sv_FI de_DE en_GB
+		#do
+		#    echo Generating locale: $i@UTF-8
+    		#    $CDDIR/usr/bin/localedef --force --inputfile=$CDDIR/usr/share/i18n/locales/$i -c --charmap=$CDDIR/usr/share/i18n/charmaps/UTF-8 --prefix=$CDDIR $i.UTF-8 || echo
+		#done
 		;;
 		
 	* )