Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv15691/scripts
Modified Files:
alsa-lib glibc kbd
Log Message:
locale fixes
Index: alsa-lib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- alsa-lib 18 Nov 2003 22:48:01 -0000 1.1
+++ alsa-lib 23 Nov 2003 11:27:39 -0000 1.2
@@ -32,9 +32,12 @@
strip_debug
rm -rf $WORKDIR/tmp || exit 1
make install DESTDIR=$WORKDIR/tmp || exit 1
+ mkdir -p $CDDIR/
copy_files $WORKDIR/tmp/usr/ $CDDIR/ || exit 1
- copy_files $WORKDIR/tmp/usr/include / || exit 1
+ rm $CDDIR/usr/share/alsa
+# copy_files $WORKDIR/tmp/usr/include / || exit 1
fi
+ exit 1
;;
install )
Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- glibc 31 Oct 2003 20:18:09 -0000 1.21
+++ glibc 23 Nov 2003 11:27:39 -0000 1.22
@@ -64,20 +64,27 @@
rm -rf $WORKDIR/tmp || exit 1
mkdir -p $WORKDIR/tmp || exit 1
make install install_root=$WORKDIR/tmp || exit 1
- #make localedata/install-locales install_root=$WORKDIR/tmp || exit 1
+ 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
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
+ #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@...
+ $CDDIR/usr/bin/localedef --inputfile=$CDDIR/usr/share/i18n/locales/$i@... -c --charmap=$CDDIR/usr/share/i18n/charmaps/ISO-8859-15 --prefix=$CDDIR $i@... || echo
+ done
;;
* )
Index: kbd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/kbd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kbd 1 Nov 2003 21:18:13 -0000 1.1
+++ kbd 23 Nov 2003 11:27:39 -0000 1.2
@@ -39,7 +39,7 @@
rm -rf $WORKDIR/tmp || exit 1
mkdir -p $WORKDIR/tmp || exit 1
make install DESTDIR=$WORKDIR/tmp/usr DATADIR=$WORKDIR/tmp/usr/share/kbd MANDIR=$WORKDIR/tmp/usr/share/man || exit 1
- rm -rf $WORKDIR/tmp/usr/share/locale || exit 1
+ #rm -rf $WORKDIR/tmp/usr/share/locale || exit 1
copy_docs $WORKDIR/tmp
cp -dpR $WORKDIR/tmp/usr $CDDIR/ || exit 1
rm -rf $WORKDIR/tmp || exit 1
|