unicode: Switch compose_second_single to gunichar

[platform/upstream/glib.git] / glib / libcharset / update.sh

diff --git a/glib/libcharset/update.sh b/glib/libcharset/update.sh
index 6e2dfce..5873fc7 100755 (executable)
--- a/glib/libcharset/update.sh
+++ b/glib/libcharset/update.sh
@@ -12,19 +12,22 @@ if test -f $ORIGINAL/lib/localcharset.c ; then : ; else
   exit 1
 fi
 
-VERSION=`grep VERSION= $ORIGINAL/configure.in | sed s/VERSION=//`
+VERSION=`grep VERSION= $ORIGINAL/configure.ac | sed s/VERSION=//`
 
 for i in localcharset.c ref-add.sin ref-del.sin config.charset ; do
   cp $ORIGINAL/lib/$i .
 done
 
-cp $ORIGINAL/include/libcharset.h.in ./libcharset.h
+for i in libcharset.h localcharset.h ; do
+  cp $ORIGINAL/include/$i.in ./$i
+done
+
+for i in codeset.m4 glibc21.m4 ; do
+  cp $ORIGINAL/m4/$i .
+done
 
 patch -p0 < libcharset-glib.patch
 
 echo "dnl From libcharset $VERSION" > ../../aclibcharset.m4
 
-for i in codeset.m4 glibc21.m4 ; do
-  cat $ORIGINAL/m4/$i >> ../../aclibcharset.m4
-done