===================================================================
RCS file: /home/cvs/OpenXM/src/asir-contrib/packages/doc/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- OpenXM/src/asir-contrib/packages/doc/Makefile.in	2009/02/15 01:51:12	1.16
+++ OpenXM/src/asir-contrib/packages/doc/Makefile.in	2009/02/21 22:09:11	1.17
@@ -1,80 +1,56 @@
-#$OpenXM: OpenXM/src/asir-contrib/packages/doc/Makefile.in,v 1.15 2009/02/14 08:34:38 takayama Exp $
-RM=rm
+#$OpenXM: OpenXM/src/asir-contrib/packages/doc/Makefile.in,v 1.16 2009/02/15 01:51:12 takayama Exp $
+RM=rm -f
 
-INSTALL_doc=@prefix@/doc
-INSTALL_lib=@prefix@/lib
-OXWEAVE=@prefix@/bin/oxweave
-OXGENTEXI=@prefix@/bin/oxgentexi
-OXREPLACE=@prefix@/bin/oxreplace
+LANGUAGES = en ja
 
+INSTALL=@INSTALL@
+INSTALL_SCRIPT=@INSTALL_SCRIPT@
+
+#top_srcdir=@top_srcdir@
+bindir=@prefix@/bin
+LIBDIR=@prefix@/lib/asir
+DOCDIR=@prefix@/doc/asir-contrib
+OXREPLACE=${bindir}/oxreplace
+
 SUBDIRS=dsolv gnuplot mathematica ok_diff ok_dmodule om \
    pfpcoh phc plucker sm1 tigers \
    todo_parametrize f_res taji_alc top noro_matrix mt_graph
 
 all :
+	@if [ ! -f ./.build_done ] ; then \
+		for i in ${SUBDIRS}; do (cd $$i && ${MAKE}); done ; \
+	    touch ./.build_done ; \
+	fi
 
-install : 
+install: install-help
+
+install-help: all
 	@if [ ! -f ./.install_help_done ] ; then \
-	    make install-help ; \
+		for i in ${SUBDIRS}; do (cd $$i && ${MAKE} install-help); done ; \
 	    touch ./.install_help_done ; \
 	else \
 	    echo "NOTE: Installation of document is already done. Remove .install_help_done for a new installation." ; \
 	fi
-install-help: install-help-en install-help-ja
-install-document : 
-	@if [ ! -f ./.install_document_done ] ; then \
-		${RM} -rf ${INSTALL_doc}/asir-contrib/ja ; \
-		${RM} -rf ${INSTALL_doc}/asir-contrib/en ; \
-	    make install-html-doc ; \
-		make fix-links ; \
-	    make install-dvi-ps-pdf-doc ; \
-	    touch ./.install_document_done ; \
+
+install-document: all
+	@if [ ! -f ./.install_doc_done ] ; then \
+		for i in ${SUBDIRS}; do (cd $$i; ${MAKE} install-document); done ; \
+		for j in ${LANGUAGES}; do \
+			${INSTALL_SCRIPT} top/fix-link.sh ${DOCDIR}/$$j/cman-html ; \
+			(cd ${DOCDIR}/$$j/cman-html; sh ./fix-link.sh $$j ${OXREPLACE}) ; \
+		done ; \
+	    touch ./.install_doc_done ; \
 	else \
 	    echo "NOTE: Installation of document is already done. Remove .install_document_done for a new installation." ; \
 	fi
-install-html-doc: install-html-doc-en install-html-doc-ja 
-install-dvi-ps-pdf-doc: install-dvi-ps-pdf-doc-en install-dvi-ps-pdf-doc-ja
 
-install-help-en: 
-	-${RM} -rf ${INSTALL_lib}/asir/help-eg/xm.help
-	-for i in ${SUBDIRS}; do (cd $$i; make INSTALL_doc='${INSTALL_doc}' INSTALL_lib='${INSTALL_lib}' OXWEAVE='${OXWEAVE}' OXGENTEXI='${OXGENTEXI}' install-help-en); done
-
-install-help-ja: 
-	-${RM} -rf ${INSTALL_lib}/asir/help-jp/xm.help
-	-for i in ${SUBDIRS}; do (cd $$i; make INSTALL_doc='${INSTALL_doc}' INSTALL_lib='${INSTALL_lib}' OXWEAVE='${OXWEAVE}' OXGENTEXI='${OXGENTEXI}' install-help-ja); done
-
-install-html-doc-en: 
-	-for i in ${SUBDIRS}; do (cd $$i; make INSTALL_doc='${INSTALL_doc}' INSTALL_lib='${INSTALL_lib}' OXWEAVE='${OXWEAVE}' OXGENTEXI='${OXGENTEXI}' install-html-en); done
-
-install-html-doc-ja: 
-	-for i in ${SUBDIRS}; do (cd $$i; make INSTALL_doc='${INSTALL_doc}' INSTALL_lib='${INSTALL_lib}' OXWEAVE='${OXWEAVE}' OXGENTEXI='${OXGENTEXI}' install-html-ja); done
-
-install-dvi-ps-pdf-doc-en: 
-	-for i in ${SUBDIRS}; do (cd $$i; make INSTALL_doc='${INSTALL_doc}' INSTALL_lib='${INSTALL_lib}' OXWEAVE='${OXWEAVE}' OXGENTEXI='${OXGENTEXI}' install-dvi-ps-pdf-en); done
-
-install-dvi-ps-pdf-doc-ja: 
-	-for i in ${SUBDIRS}; do (cd $$i; make INSTALL_doc='${INSTALL_doc}' INSTALL_lib='${INSTALL_lib}' OXWEAVE='${OXWEAVE}' OXGENTEXI='${OXGENTEXI}' install-dvi-ps-pdf-ja); done
-
-fix-links: fix-links-en fix-links-ja
-fix-links-ja:
-	cp top/fix-link.sh ${INSTALL_doc}/asir-contrib/ja/cman-html
-	(cd ${INSTALL_doc}/asir-contrib/ja/cman-html; sh ./fix-link.sh ja ${OXREPLACE})
-fix-links-en:
-	cp top/fix-link.sh ${INSTALL_doc}/asir-contrib/en/cman-html
-	(cd ${INSTALL_doc}/asir-contrib/en/cman-html; sh ./fix-link.sh en ${OXREPLACE})
-
 clean:
-	-${RM} -rf ./.*done config.log config.status autom4te.cache
-	for i in ${SUBDIRS}; do (cd $$i; make clean); done
-distclean: clean
-	-${RM} -rf ${INSTALL_lib}/asir/help-eg/xm.help
-	-${RM} -rf ${INSTALL_lib}/asir/help-jp/xm.help
-	-${RM} -rf ${INSTALL_doc}/asir-contrib
-	-${RM} -rf ${INSTALL_doc}/asir-contrib
+	for i in ${SUBDIRS}; do (cd $$i; ${MAKE} clean); done
 
-
-
-# For a test.
-gen-help-ja: 
-	-for i in ${SUBDIRS}; do (cd $$i; make INSTALL_doc='${INSTALL_doc}' INSTALL_lib='${INSTALL_lib}' OXWEAVE='${OXWEAVE}' OXGENTEXI='${OXGENTEXI}' gen-help-ja); done
-
+distclean: clean
+	-for j in ${LANGUAGES}; do \
+		${RM} -r ${LIBDIR}/help-$$j/xm.help ; \
+	done
+	-${RM} -r ${DOCDIR}
+	-${RM} -r ./.*done config.log config.status autom4te.cache 
+	-${RM} Makefile M/Makefile