From 79c6567f23680b5c1723726f541b614caa153fe3 Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Mon, 29 Nov 2010 19:58:03 +0900
Subject: [PATCH] =?utf8?q?=E3=83=89=E3=82=AD=E3=83=A5=E3=83=A1=E3=83=B3?=
 =?utf8?q?=E3=83=88=E4=BD=9C=E6=88=90=E7=94=A8=E3=81=AEMakefile=E3=82=92?=
 =?utf8?q?=E6=95=B4=E7=90=86=E3=80=82=E4=B8=AD=E9=96=93=E3=83=95=E3=82=A1?=
 =?utf8?q?=E3=82=A4=E3=83=AB=E3=81=AF=E3=81=99=E3=81=90=E3=81=AB=E5=89=8A?=
 =?utf8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 doc/Makefile     | 38 +++++++++++++++++++++++++-------------
 doc/yacasl2.html |  2 +-
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index e5b87fd..44d63a8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,29 +1,41 @@
 DOCNAME = yacasl2
 SRC = $(DOCNAME).texi
 CSS = style.css
-TEXBIN = /usr/local/teTeX/bin
+TEXBIN = /usr/local/texlive/2010/bin/x86_64-linux
 PTEX = $(TEXBIN)/ptex
 TEXINDEX = $(TEXBIN)/texindex
 DVI2PDF = $(TEXBIN)/dvipdfmx
-TEXOBJDIR = texobj
+MAKEINFO = makeinfo
 
 .PHONY: all htmlnosplit pdf clean
+
+.INTERMEDIATE: yacasl2.dvi
+
+htmlnosplit: $(DOCNAME).html
+
 all: info htmlnosplit html pdf
+
+html: $(SRC) $(CSS)
+	@if test ! -s $@; then mkdir $@; fi;
+	@cp $(CSS) $@/$(CSS)
+	@$(MAKEINFO) -o $@ --html --css-ref=style.css $(SRC)
+
+pdf: $(DOCNAME).pdf
+
 info: $(DOCNAME).info
+
 $(DOCNAME).info: $(SRC)
-	@makeinfo -o $@ $^
-htmlnosplit: $(DOCNAME).html
+	@$(MAKEINFO) -o $@ $^
+
 $(DOCNAME).html: $(SRC) $(CSS)
-	@makeinfo -o $@ --no-split --no-headers --html --css-include=$(CSS) $(SRC)
-html: $(SRC) $(CSS)
-	@if test ! -s $@; then mkdir $@; fi; \
-     cp $(CSS) $@/$(CSS); \
-     makeinfo -o $@ --html --css-ref=style.css $(SRC)
-pdf: $(DOCNAME).pdf
+	@$(MAKEINFO) -o $@ --no-split --no-headers --html --css-include=$(CSS) $(SRC)
+
 $(DOCNAME).pdf: $(DOCNAME).dvi
 	@$(DVI2PDF) $^
+
 $(DOCNAME).dvi: $(SRC)
-	@if test ! -s $(TEXOBJDIR); then mkdir $(TEXOBJDIR); fi; \
-     TEX=ptex texi2dvi -q --texinfo=@afourpaper $^
+	@TEX=ptex texi2dvi -q --texinfo=@afourpaper -o $@ $<
+	@rm -rf $(DOCNAME).aux $(DOCNAME).cp $(DOCNAME).cps $(DOCNAME).fn $(DOCNAME).ky $(DOCNAME).log $(DOCNAME).pg $(DOCNAME).pgs $(DOCNAME).tmp $(DOCNAME).toc $(DOCNAME).tp $(DOCNAME).vr
+
 clean:
-	@rm -rf html $(TEXOBJDIR) $(DOCNAME).info $(DOCNAME).?? $(DOCNAME).???
+	@rm -rf html $(DOCNAME).info $(DOCNAME).pdf $(DOCNAME).html $(DOCNAME).dvi
diff --git a/doc/yacasl2.html b/doc/yacasl2.html
index 3ddd0bb..40df70a 100644
--- a/doc/yacasl2.html
+++ b/doc/yacasl2.html
@@ -3,7 +3,7 @@
 <title>YACASL2 - Linux上のCASL II処理系</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="YACASL2 - Linux上のCASL II処理系">
-<meta name="generator" content="makeinfo 4.11">
+<meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <!--
-- 
2.18.0