===================================================================
RCS file: /home/cvs/OpenXM/src/asir-doc/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.20
diff -u -p -r1.8 -r1.20
--- OpenXM/src/asir-doc/Makefile.in	2009/02/23 06:56:46	1.8
+++ OpenXM/src/asir-doc/Makefile.in	2021/03/25 05:56:49	1.20
@@ -1,21 +1,19 @@
-# $OpenXM: OpenXM/src/asir-doc/Makefile.in,v 1.7 2009/02/22 23:35:12 ohara Exp $
+# $OpenXM: OpenXM/src/asir-doc/Makefile.in,v 1.19 2021/01/22 03:07:15 noro Exp $
 OpenXM_HOME=@OpenXM_HOME@
 OpenXM_doc_asir2000=${OpenXM_HOME}/doc/asir2000
 OpenXM_lib_asir=${OpenXM_HOME}/lib/asir
 OpenXM_man=${OpenXM_HOME}/man/man1
 CC=@CC@
-TEX=tex
+TEX=@TEX@
 PTEX=@PTEX@
-DVIPDF=@DVIPDF@
-MAKEINFO=@MAKEINFO@
+MAKEINFO=@MAKEINFO@ --force
 LANGUAGES = en ja
 INSTALL = cp -f
+TEXI2HTML = @TEXI2HTML@
+TEXINDEX = @TEXINDEX@
 
-.SUFFIXES: .dvi .pdf
+.SUFFIXES: .pdf
 
-.dvi.pdf:
-	${DVIPDF} $<
-
 all:
 	if [ ! -f .make_done ]; then ${MAKE} all2 ; touch .make_done ; fi
 
@@ -31,7 +29,7 @@ install: all
 		for j in ${LANGUAGES}; do \
 			tar cf - help-$$j | (cd ${OpenXM_lib_asir}; tar xf -) ; \
 			tar cf - html-$$j | (cd ${OpenXM_doc_asir2000}; tar xf -) ; \
-			${INSTALL} man-$$j.dvi man-$$j.pdf ${OpenXM_doc_asir2000} ; \
+			${INSTALL} man-$$j.pdf ${OpenXM_doc_asir2000} ; \
 		done ; \
 		tar cf - html-internal-ja | (cd ${OpenXM_doc_asir2000}; tar xf -) ; \
 		tar cf - html-exp-ja      | (cd ${OpenXM_doc_asir2000}; tar xf -) ; \
@@ -39,15 +37,6 @@ install: all
 		touch .install_done ; \
 	fi
 
-configure-texindex:
-	if [ ! -f .configure_sub_done ]; then \
-		(cd jtexindex/C; ./configure; ${MAKE} clean); \
-		touch .configure_sub_done ; \
-	fi
-
-texindex: configure-texindex
-	(cd jtexindex/C; ${MAKE})
-
 BUILTINS=\
 	parts/builtin/array.texi parts/builtin/bit.texi\
 	parts/builtin/function.texi parts/builtin/io.texi\
@@ -86,73 +75,74 @@ INTERNAL_SRCS=internal.texi int-parts/datatype.texi in
     int-parts/datatype/vect.texi
 
 tmp-en tmp-html-en: extract_man
-tmp-ja tmp-ja_euc tmp-html-ja tmp-html-internal-ja: extract_man
-man-en.dvi man-ja.dvi: texindex
+tmp-ja tmp-html-ja tmp-html-internal-ja: extract_man
 help-en help-func: extract_func
 html-win-en html-win: gen_hh
 
 tmp-ja: ${SRCS}
 	-rm -rf $@
 	-mkdir -p $@/parts/builtin
-	-cp texinfo.* txi*tex $@
-	-for i in ${SRCS}; do ./extract_man ja $$i > $@/$$i; done
+	-cp texinfo/* $@
+	-for i in ${SRCS}; do ./extract_man ja $$i | nkf -w > $@/$$i; done
 
-tmp-ja_euc: ${SRCS}
-	-rm -rf $@
-	-mkdir -p $@/parts/builtin
-	-cp texinfo.* txi*tex $@
-	-for i in ${SRCS}; do ./extract_man ja $$i | nkf -e > $@/$$i; done
-
 tmp-html-ja: ${SRCS}
 	-rm -rf $@
 	-mkdir -p $@/parts/builtin
-	-cp texinfo.* txi*tex $@
+	-cp texinfo/* $@
 	-for i in ${SRCS}; do \
-	  ./extract_man ja $$i | nkf -e | sed -e "s/@fref/@ref/g" > $@/$$i; \
+	  ./extract_man ja $$i | nkf -w | sed -e "s/@fref/@ref/g" > $@/$$i; \
 	done 
 
 tmp-en: ${SRCS}
 	-rm -rf $@
 	-mkdir -p $@/parts/builtin
-	-cp texinfo.* txi*tex $@
+	-cp texinfo/* $@
 	-for i in ${SRCS}; do ./extract_man en $$i > $@/$$i; done
 
 tmp-html-en: ${SRCS}
 	-rm -rf $@
 	-mkdir -p $@/parts/builtin
-	-cp texinfo.* txi*tex $@
+	-cp texinfo/* $@
 	-for i in ${SRCS}; do \
 		./extract_man en $$i | sed -e "s/@fref/@ref/g" > $@/$$i;\
 	done
 
+tmp-internal-ja: ${INTERNAL_SRCS}
+	-rm -rf $@
+	-mkdir -p $@/parts/builtin $@/int-parts/datatype
+	-cp texinfo/* $@
+	-for i in ${INTERNAL_SRCS}; do \
+	  ./extract_man ja $$i | nkf -w > $@/$$i; \
+	done 
+
 tmp-html-internal-ja: ${INTERNAL_SRCS}
 	-rm -rf $@
 	-mkdir -p $@/parts/builtin $@/int-parts/datatype
-	-cp texinfo.* txi*tex $@
+	-cp texinfo/* $@
 	-for i in ${INTERNAL_SRCS}; do \
-	  ./extract_man ja $$i | nkf -e | sed -e "s/@fref/@ref/g" > $@/$$i; \
+	  ./extract_man ja $$i | nkf -w | sed -e "s/@fref/@ref/g" > $@/$$i; \
 	done 
 
-man-ja.dvi: tmp-ja
-	-(cd tmp-ja; ${PTEX} man.texi; ../jtexindex/C/texindex man.??; ${PTEX} man.texi)
-	-mv -f tmp-ja/man.dvi $@
+man-ja.pdf: tmp-ja
+	-(cd tmp-ja; ${PTEX} man.texi; ${TEXINDEX} man.??; ${PTEX} man.texi)
+	-mv -f tmp-ja/man.pdf $@
 	-touch $@
 
-man-en.dvi: tmp-en
-	-(cd tmp-en; ${TEX} man.texi; ../jtexindex/C/texindex man.??; ${TEX} man.texi)
+man-en.pdf: tmp-en
+	-(cd tmp-en; ${TEX} man.texi; ${TEXINDEX} man.??; ${TEX} man.texi)
 	-(cd tmp-en; ${MAKEINFO} man.texi)
-	-mv -f tmp-en/man.dvi $@
+	-mv -f tmp-en/man.pdf $@
 	-touch $@
 
-man: man-ja.pdf man-en.pdf
+man: man-ja.pdf man-en.pdf internal-ja.pdf exp-ja.pdf
 
-help-ja: tmp-ja_euc man-ja.dvi
+help-ja: tmp-ja man-ja.pdf
 	-rm -rf $@
 	-mkdir -p $@
-	-(cd tmp-ja_euc; ${MAKEINFO} man.texi)
-	-(cd $@; for i in ../tmp-ja_euc/risaman*; do ../extract_func -j $$i; done)
+	-(cd tmp-ja; ${MAKEINFO} man.texi)
+	-(cd $@; for i in ../tmp-ja/risaman*; do ../extract_func -j $$i; done)
 
-help-en: tmp-en man-en.dvi
+help-en: tmp-en man-en.pdf
 	-rm -rf $@
 	-mkdir -p $@
 	-(cd $@; for i in ../tmp-en/risaman*; do ../extract_func $$i; done)
@@ -160,12 +150,12 @@ help-en: tmp-en man-en.dvi
 html-ja: tmp-html-ja
 	-rm -rf $@
 	-mkdir -p $@
-	-(cd $@; ../texi2html -menu -split_node ../tmp-html-ja/man.texi)
+	-(cd $@; ${TEXI2HTML} -menu -split_node ../tmp-html-ja/man.texi)
 
 html-en: tmp-html-en
 	-rm -rf $@
 	-mkdir -p $@
-	-(cd $@; ../texi2html -menu -split_node ../tmp-html-en/man.texi)
+	-(cd $@; ${TEXI2HTML} -menu -split_node ../tmp-html-en/man.texi)
 
 html-win: html-ja gen_hh
 	-rm -rf $@
@@ -182,19 +172,25 @@ html-win-en: html-en gen_hh
 html-internal-ja: tmp-html-internal-ja
 	-rm -rf $@
 	-mkdir -p $@
-	-(cd $@; ../texi2html ../tmp-html-internal-ja/internal.texi)
+	-(cd $@; ${TEXI2HTML} ../tmp-html-internal-ja/internal.texi)
 
 html-exp-ja: exp/exp-ja.texi
 	-rm -rf $@
 	-mkdir -p $@
-	-nkf -e exp/exp-ja.texi > $@/exp-ja.texi
-	-(cd $@; ../texi2html -menu -split_node exp-ja.texi)
+	-nkf -w exp/exp-ja.texi > $@/exp-ja.texi
+	-cp texinfo/* $@
+	-(cd $@; ${TEXI2HTML} -expandinfo -menu -split_node exp-ja.texi)
 
-internal-ja.dvi: tmp-html-internal-ja
-	-(cd tmp-html-internal-ja; ${PTEX} internal.texi; ../jtexindex/C/texindex internal.??; ${PTEX} internal.texi)
-	-mv -f tmp-html-internal-ja/internal.dvi $@
+internal-ja.pdf: tmp-internal-ja
+	-(cd tmp-internal-ja; ${PTEX} internal.texi; ${TEXINDEX} internal.??; ${PTEX} internal.texi)
+	-mv -f tmp-internal-ja/internal.pdf $@
 	-touch $@
 
+exp-ja.pdf: html-exp-ja
+	-(cd html-exp-ja; ${PTEX} exp-ja.texi; ${TEXINDEX} exp-ja.??; ${PTEX} exp-ja.texi)
+	-mv -f html-exp-ja/exp-ja.pdf $@
+	-touch $@
+
 extract_func: extract_func.o
 	${CC} -o $@ extract_func.o
 
@@ -211,9 +207,8 @@ targzuu: help-en help-ja html-en html-ja
 	-tar cf - html-ja | gzip -9 | uuencode html-ja.tgz > html-ja.uu
 
 clean:
-	(cd jtexindex/C; ${MAKE} clean)
-	-rm -f man*.dvi man*.pdf *.o extract_man extract_func gen_hh
-	-rm -f internal-ja.dvi
+	-rm -f man*.pdf man*.pdf *.o extract_man extract_func gen_hh
+	-rm -f internal-ja.pdf exp-ja.pdf
 	-rm -rf tmp*
 	-rm -rf help-*
 	-rm -rf html-*