Also install comp.dat, and fixed a bug in create_comps()

diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index a5030f131d1bae1c5554d93cfb0578e760606057..f746964fd26f2c08148e346a57e3184e425d516d 100644 (file)
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -23,7 +23,7 @@ ucgendat: $(LIBRARY) ucgendat.o
        $(LTLINK) -o $@ ucgendat.o $(LIBS)
        ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
 
-DATFILES = case.dat cmbcl.dat ctype.dat decomp.dat num.dat
+DATFILES = case.dat cmbcl.dat comp.dat ctype.dat decomp.dat num.dat
 
 install-local: $(PROGRAMS) FORCE
        -$(MKDIR) $(DESTDIR)$(datadir)/ucdata

diff --git a/libraries/liblunicode/ucdata/ucgendat.c b/libraries/liblunicode/ucdata/ucgendat.c
index 507503f3b53bfd172726660fbeb379a624a98470..ff165f7308d48b2e08a8d06f82056afdea409b4e 100644 (file)
--- a/libraries/liblunicode/ucdata/ucgendat.c
+++ b/libraries/liblunicode/ucdata/ucgendat.c
@@ -1159,6 +1159,7 @@ create_comps(void)
        comps[cu].code2 = decomps[i].decomp[1];
        cu++;
     }
+    comps_used = cu;
     qsort(comps, comps_used, sizeof(_comp_t),
          (int (*)(const void *, const void *)) cmpcomps);
 }