[Lunar-commits] r19430 - moonbase/trunk/libs/glibc

[Auke Kok]

Author: sofar
Date: 2006-03-25 00:58:18 +0000 (Sat, 25 Mar 2006)
New Revision: 19430

Modified:
   moonbase/trunk/libs/glibc/BUILD
Log:
Make locale stuff tracked by installwatch for the normal case with all locale's. The safety is stil on when you select locale's. -TESTED-


Modified: moonbase/trunk/libs/glibc/BUILD
===================================================================
--- moonbase/trunk/libs/glibc/BUILD	2006-03-24 22:38:46 UTC (rev 19429)
+++ moonbase/trunk/libs/glibc/BUILD	2006-03-25 00:58:18 UTC (rev 19430)
@@ -150,18 +150,19 @@
   rm /lib/{ld,lib{c,dl,m,rt,pthread,nss_files,util,nsl,crypt}}-lunar.so  &&
 
   # Generate locale info
-  unset   LD_PRELOAD             &&
-  if  [  -z  "$GLIBC_LOCALES"  ];  then
+  if [ -z "$GLIBC_LOCALES" ]; then
     make localedata/install-locales || exit 1
   else
-    for  LOCALE  in  $GLIBC_LOCALES;  do
-      INPUTFILE=`echo  $LOCALE  |  cut  -d /  -f1`
-        CHARMAP=`echo  $LOCALE  |  cut  -d /  -f2`
-      mkdir  -p  /usr/lib/locale/$INPUTFILE
-      echo "localedef  -i  $INPUTFILE  -f  $CHARMAP  $INPUTFILE"
-            localedef  -i  $INPUTFILE  -f  $CHARMAP  $INPUTFILE
+    devoke_installwatch &&
+    for LOCALE in $GLIBC_LOCALES; do
+      INPUTFILE=$(echo $LOCALE | cut -d/ -f1)
+      CHARMAP=$(echo  $LOCALE | cut -d/ -f2)
+      mkdir -p /usr/lib/locale/$INPUTFILE
+      echo "localedef -i $INPUTFILE -f $CHARMAP $INPUTFILE"
+      localedef -i $INPUTFILE -f $CHARMAP $INPUTFILE
     done
-    true
+    invoke_installwatch &&
+    touch /usr/lib/locale/locale-archive
   fi
   
-) > $C_FIFO 2>&1  &&  ldconfig
+) > $C_FIFO 2>&1 && ldconfig