Fix problems compiling documentation

* Two warnings (deprecated regex syntax)
* One error (couldn't find pintos-t2h.init without "./" prefix)

diff --git a/doc/Makefile b/doc/Makefile
index 95dd71bdf0e6c5a0dfed6a06f0c6bdd60228df2a..9e0e994bc9a1698bcba28056442b9ea0fcf7dc48 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,7 +6,7 @@ bibliography.texi localsettings.texi
 all: pintos.html pintos.info pintos.pdf
 
 pintos.html: $(TEXIS) texi2html
-       ./texi2html -toc_file=$@ -split=chapter -nosec_nav -nomenu -init_file pintos-t2h.init $<
+       ./texi2html -toc_file=$@ -split=chapter -nosec_nav -nomenu -init_file ./pintos-t2h.init $<
 
 pintos.info: $(TEXIS)
        makeinfo $<

diff --git a/doc/texi2html b/doc/texi2html
index 30416a6d212d393ccb2848aafae08f7a870ef07d..7cb22fa94bdc576fb31276f26a3eab240e057a7d 100755 (executable)
--- a/doc/texi2html
+++ b/doc/texi2html
@@ -6163,7 +6163,7 @@ sub substitute_style
     {
         $changed = 0;
         $done = '';
-        while (/\@(\w+){([^\{\}]+)}/ || /\@(,){([^\{\}]+)}/)
+        while (/\@(\w+)\{([^\{\}]+)}/ || /\@(,)\{([^\{\}]+)}/)
         {
             $text = &apply_style($1, $2);
             if ($text)