*** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index 5358407..bfa07a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,7 +95,7 @@ SRCALL = \
        data/m17n-config.txt data/exprog.txt data/exmim.txt data/dbformat.txt \
        data/dbdata.txt
 
-DBDATA = $(shell echo @M17NDB@/*.mim @M17NDB@/*.flt @M17NDB@/*.tab @M17NDB@/*.tbl)
+DBDATA = $(shell echo @M17NDB@/*.{dir,mim,flt,fst,tbl})
 
 HTML_USR_TARGET = usr/html/index.html usr/html/parrot.png
 HTML_JA_TARGET = ja/html/index.html ja/html/parrot.png
@@ -223,8 +223,8 @@ data/exprog.txt: ${EXAMPLE_PROGS} utils/exprog.sh
 data/exmim.txt: ${EXAMPLE_MIMS} utils/exmim.sh
        utils/exmim.sh ${EXAMPLE_MIMS} > $@
 
-data/dbdata.txt: ${DBDATA} utils/dbdata.sh
-       utils/dbdata.sh @M17NDB@ > $@
+data/dbdata.txt: ${DBDATA} utils/dbdata.awk
+       gawk -f utils/dbdata.awk @M17NDB@/mdb.dir > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
        utils/dbformat.sh ${DBFORMAT}/*.txt > $@

diff --git a/utils/dbdata.awk b/utils/dbdata.awk
index be6fd3f..6adc3af 100644 (file)
--- a/utils/dbdata.awk
+++ b/utils/dbdata.awk
@@ -1,17 +1,20 @@
 BEGIN {
+  
   print "/***";
 }
 
-/".*\.(tbl|mim|tab|flt)"/ {
-  FROM=match($0, "\".*\.(tbl|mim|tab|flt)\"") + 1;
+/".*\.(mim|flt|fst|tbl)"/ {
+  FROM=match($0, "\".*\\.(mim|flt|fst|tbl)\"") + 1;
   LEN=RLENGTH-2;
   FILE=substr($0, FROM, LEN);
-  system("sed -n '/^[;#][;#]* <li>/,/^$/s/^[;#][;#]* *//p' "FILE);
+  DIR=FILENAME;
+  gsub("/[^/]*$", "", DIR)
+  system("sed -n '/^;;;/s/^;;; *//p' "DIR"/"FILE);
   printf "\n";
 }
 
-/^;; / {
-  print substr($0, 4);
+/^;;;/ {
+  print substr($0, 5);
 }
 
 END {