Some more html rules for doc/misc/Makefile.in.

* doc/misc/Makefile.in (emacs-faq.html): Fix some more cross-refs.
(emacs-faq.text): New target.
(clean): Add emacs-faq.

2 files changed, 11 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b27b1aae5b7..1a1ca1d6296 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (emacs-faq.html): Fix some more cross-refs.
+        (emacs-faq.text): New target.
+        (clean): Add emacs-faq.
+
 2011-03-12  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.2.1.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 6ecf6bc02f8..450199a33c5 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -408,7 +408,10 @@ faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
 emacs-faq.html: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) --no-split \
           --css-ref='/layout.css' --html -o $@ $<
-        sed -i 's|a href="emacs.html#\([^"]*\)"|a href="manual/html_node/emacs/\1.html"|g' $@
+        sed -i -e 's|a href="\([a-z]*\)\.html#\([^"]*\)"|a href="manual/html_node/\1/\2.html"|g' \
+          -e 's|/Top\.html|/|g' $@
+emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
+        $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ $<
 
 flymake : $(infodir)/flymake
 $(infodir)/flymake: flymake.texi
@@ -692,7 +695,7 @@ mostlyclean:
         rm -f gnustmp.*
 
 clean: mostlyclean
-        rm -f $(DVI_TARGETS) $(PDF_TARGETS) $(HTML_TARGETS)
+        rm -f $(DVI_TARGETS) $(PDF_TARGETS) $(HTML_TARGETS) emacs-faq.text
 
 distclean: clean
 #       rm -f Makefile