texi2html doesn't support @verbatiminclude, so kluge it.

diff --git a/doc/.cvsignore b/doc/.cvsignore
index cb7722e558534872ac56ab5d72aa6200eaba66dc..ba565ea8e851fa3d67cd013e7009f443e2685c7f 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -18,3 +18,4 @@ pintos.html
 pintos.pdf
 pintos.ps
 pintos_*.html
+sample.tmpl.texi

diff --git a/doc/Makefile b/doc/Makefile
index 371e366a1cd55408712c356d3b0734b89e554e2a..e06d52832b5598e5ae364d048b574513c2eba640 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,6 @@
 TEXIS = pintos.texi intro.texi tour.texi threads.texi userprog.texi    \
 vm.texi filesys.texi references.texi standards.texi doc.texi           \
-sample.tmpl devel.texi debug.texi 44bsd.texi
+sample.tmpl.texi devel.texi debug.texi 44bsd.texi
 
 all: pintos.html pintos.info pintos.dvi pintos.ps pintos.pdf
 
@@ -19,6 +19,9 @@ pintos.ps: pintos.dvi
 pintos.pdf: $(TEXIS)
        texi2pdf $< -o $@
 
+%.texi: %
+       sed < $< > $@ 's/\([{}@]\)/\@\1/g;'
+
 clean:
        rm -f *.info *.html
        rm -f *.dvi *.pdf *.ps *.log *~

diff --git a/doc/doc.texi b/doc/doc.texi
index 90edb1e4fd07c74bb65763b47592b7b6eb0ae92b..c43a5bb9d9df506e717d6a626d082abc04840d61 100644 (file)
--- a/doc/doc.texi
+++ b/doc/doc.texi
@@ -54,4 +54,6 @@ joins @var{B}, then @var{A} joins @var{C}), and so on.
 @node Sample Design Document
 @section Sample Design Document
 
-@verbatiminclude sample.tmpl
+@example
+@include sample.tmpl.texi
+@end example