X-Git-Url: http://git.chise.org/gitweb/?p=m17n%2Fm17n-docs.git;a=blobdiff_plain;f=Makefile.am;h=20571841911dfa2b38e453ff7edd431016ad3c4f;hp=b059480414d249fb83516076a9117a20cec73c3a;hb=0b6d6f3dcd05cd5a392bfd4e6c0d50222ffeab56;hpb=1b2af6ce7aedce105572827d5cb7c84eb030f962

diff --git a/Makefile.am b/Makefile.am
index b059480..2057184 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,7 +93,7 @@ SRCALL = \
 	data/dbformat.txt data/dbdata.txt fdl.txt
 
 DBDATA = $(shell echo @M17NDB@/*.{dir,mim,flt,fst,tbl})
-DBIMAGE = $(shell echo @M17NDB@/FORMATS/*.png @M17NDB@/FORMATS/*.eps)
+DBIMAGE = $(shell echo images/*.png images/*.eps)
 
 HTML_USR_TARGET = usr/html/index.html usr/html/parrot.png
 HTML_JA_TARGET = ja/html/index.html ja/html/parrot.png
@@ -224,7 +224,7 @@ doxyfile-man%.usr: doxyfile-man%
 data/exprog.txt: ${EXAMPLE_PROGS} utils/exprog.sh
 	utils/exprog.sh ${EXAMPLE_PROGS} > $@
 
-data/dbdata.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.dir utils/dbdata.awk
+data/dbdata.txt: ${DBDATA} ${DBIMAGE} @M17NDB@/mdb.dir utils/dbdata.awk utils/dbdata.sh
 	@AWK@ -f utils/dbdata.awk @M17NDB@/mdb.dir > $@
 
 data/dbformat.txt: ${DBFORMAT} utils/dbformat.sh
@@ -240,7 +240,7 @@ data/m17n-db.txt: @M17NDB@/m17n-db.in
 			utils/%_filter.rb m17n-lib.css
 	rm -f `dirname $@`/*.html
 	${DOXYGEN} $<
-	cd `dirname $@`; rm *_8c* *_8h* *_8txt* dirs.html dir_* files.html
+	cd `dirname $@`; rm -f *_8c* *_8h* *_8txt* dirs.html dir_* files.html
 	echo 'code { font-weight: bold }' >> `dirname $@`/doxygen.css
 
 %/html/parrot.png: parrot.png
@@ -249,7 +249,7 @@ data/m17n-db.txt: @M17NDB@/m17n-db.in
 %/latex/refman.tex: doxyfile-latex.% ${SRCALL} utils/%_filter.rb
 	rm -rf `dirname $@`
 	${DOXYGEN} $<
-	cd `dirname $@`; rm *_8c* *_8h* *_8txt* dirs.tex dir_* files.tex
+	cd `dirname $@`; rm -f *_8c* *_8h* *_8txt* dirs.tex dir_* files.tex
 
 %/latex/m17n-lib.dvi: %/latex/refman.tex styles/m17n-lib.sty utils/latex.sh
 	utils/latex.sh `dirname $@` latex
@@ -263,8 +263,9 @@ data/m17n-db.txt: @M17NDB@/m17n-db.in
 
 %/man/man1/m17n-config.1: doxyfile-man1.% ${MAN1} utils/%_filter.rb
 	rm -rf `dirname $@`
+	cp doxyfile-man1.usr temp
 	${DOXYGEN} $<
-	cd `dirname $@`; rm _*.1 *.c.1 *.txt.1
+	cd `dirname $@`; rm -f _*.1 *.c.1 *.txt.1
 
 %/man/man3/m17nIntro.3m17n: doxyfile-man3.% ${MAN3} utils/%_filter.rb
 	rm -rf `dirname $@`