ext2fs: nls: support UTF-8 11.0 with NFKD normalization

[thirdparty/e2fsprogs.git] / util / gen-android-files

diff --git a/util/gen-android-files b/util/gen-android-files
index 994337bb1e563378d41b8edf090cc852ceb09bb9..937496bcab0d6a9b11f483a7b35634142c237bcd 100755 (executable)
--- a/util/gen-android-files
+++ b/util/gen-android-files
@@ -7,15 +7,15 @@ ANDROID_GENERATED_FILES="lib/ext2fs/ext2_err.c lib/ext2fs/ext2_err.h \
        lib/ext2fs/ext2_types.h lib/config.h lib/blkid/blkid.h \
        lib/uuid/uuid.h lib/ext2fs/crc32c_table.h misc/default_profile.c \
        lib/ss/std_rqs.c debugfs/debug_cmds.c debugfs/ro_debug_cmds.c \
-       debugfs/extent_cmds.c debugfs/e2freefrag.c debugfs/create_inode.c \
+       debugfs/extent_cmds.c debugfs/e2freefrag.c \
        debugfs/recovery.c debugfs/revoke.c \
        MODULE_LICENSE_GPL README.version"
 
 SS_DIR=$(pwd)/lib/ss
 MK_CMDS=/tmp/mk_cmds$$.sh
 
-sed -e "s;@SS_DIR@;$SS_DIR;" < $SS_DIR/mk_cmds.sh.in \
-    | sed -e "s/@AWK@/awk/" | sed -e "s/@SED@/sed/" > $MK_CMDS
+sed -e "s/@AWK@/awk/" < $SS_DIR/mk_cmds.sh.in \
+    | sed -e "s/@SED@/sed/" > $MK_CMDS
 
 sed -e "s/@E2FSPROGS_VERSION@/$(git describe)/" < lib/ext2fs/ext2_err.et.in > lib/ext2fs/ext2_err.et
 
@@ -29,7 +29,7 @@ done
 for i in lib/ss/std_rqs debugfs/debug_cmds debugfs/ro_debug_cmds \
                        debugfs/extent_cmds
 do
-    /bin/sh $MK_CMDS $i.ct
+    _SS_DIR_OVERRIDE=lib/ss /bin/sh $MK_CMDS $i.ct
     mv -f $(basename $i).c $i.c
 done
 
@@ -41,7 +41,7 @@ cp util/android_types.h lib/ext2fs/ext2_types.h
 cp util/android_types.h lib/blkid/blkid_types.h
 cp util/android_types.h lib/uuid/uuid_types.h
 cp util/android_config.h lib/config.h
-cp misc/e2freefrag.c misc/create_inode.c debugfs/
+cp misc/e2freefrag.c debugfs/
 cp e2fsck/recovery.c e2fsck/revoke.c debugfs/
 
 gcc -o gen_crc32ctable lib/ext2fs/gen_crc32ctable.c