===================================================================
RCS file: /home/cvs/OpenXM/doc/OpenXM-specs/Makefile,v
retrieving revision 1.13
retrieving revision 1.17
diff -u -p -r1.13 -r1.17
--- OpenXM/doc/OpenXM-specs/Makefile	2003/03/26 13:26:00	1.13
+++ OpenXM/doc/OpenXM-specs/Makefile	2003/09/15 08:53:34	1.17
@@ -1,13 +1,15 @@
-#$OpenXM: OpenXM/doc/OpenXM-specs/Makefile,v 1.12 2003/03/26 06:19:04 takayama Exp $
+#$OpenXM: OpenXM/doc/OpenXM-specs/Makefile,v 1.16 2003/08/22 23:56:27 takayama Exp $
 all : doc
 
 LATEX2HTML=latex2html -tmp /tmp
+JFIX=${OpenXM_HOME}/src/util/sample1.sh
 DVIPS=dvips -f
 RSYNC=rsync -Cavz
 CURRENT=/home/web/OpenXM/Current
 NKF=nkf -e
 
-OXWEAVE=../../src/kxx/oxweave
+OXWEAVE=../../bin/oxweave
+OXWEAVE_C=../../src/util/oxweave.c
 OXWEAVEFLAG=--recursive --plain
 OXREPLACE=../../src/util/oxreplace
 SRC= OpenXM.tex cmo-basic0.tex cmo-basic1.tex\
@@ -53,23 +55,25 @@ OX-RFC-101-ja.dvi: $(OXWEAVE) $(SRC101)
 	-mv tmp101JA/OX-RFC-101.dvi OX-RFC-101-ja.dvi
 	touch OX-RFC-101-ja.dvi
 
-$(OXWEAVE) : $(OXWEAVE).c
-	(cd ../../src/kxx ; make oxweave)
+$(OXWEAVE) : $(OXWEAVE_C)
+	(cd ../../src/util ; make oxweave)
 
 all-html: all-html-ja all-html-en
-all-html-en: doc .all-html-100-en.done .all-html-101-en.done
+all-html-en: doc
 	if test ! -f .all-html-100-en.done ; \
 	then \
 		(cd tmpEN ; latex OpenXM; latex OpenXM ; $(LATEX2HTML) OpenXM ) ; \
+	    (cd tmpEN/OpenXM ; $(JFIX) *.html ; rm -f *-tmp.old ) ; \
 		touch .all-html-100-en.done ; \
 	fi
 	if test ! -f .all-html-101-en.done ; \
 	then \
 		(cd tmp101EN ; latex OX-RFC-101; latex OX-RFC-101 ; $(LATEX2HTML) OX-RFC-101 ) ; \
+	    (cd tmp101EN/OX-RFC-101 ; $(JFIX) *.html ; rm -f *-tmp.old ) ; \
 		touch .all-html-101-en.done ; \
 	fi
 
-all-html-ja: doc .all-html-100-ja.done .all-html-101-ja.done
+all-html-ja: doc 
 	if test ! -f .all-html-100-ja.done ; \
 	then \
 		(cd tmpJA; platex OpenXM; platex OpenXM ; $(LATEX2HTML) OpenXM) ; \
@@ -83,14 +87,6 @@ all-html-ja: doc .all-html-100-ja.done .all-html-101-j
 		touch .all-html-101-ja.done ; \
 	fi
 
-.all-html-100-en.done: ${SRC}
-	make clean-done
-.all-html-101-en.done: ${SRC101}
-	make clean-done
-.all-html-100-ja.done: ${SRC}
-	make clean-done
-.all-html-101-ja.done: ${SRC101}
-	make clean-done
 
 install-web-all: all-html
 	if test ! -d ${CURRENT}/doc ; then mkdir ${CURRENT}/doc ; fi