6 files changed, 21 insertions, 10 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 746e5ec7ca..5899e27312 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -2,9 +2,9 @@
 
 	* Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
 	(DVIPS): New variable.
-	(.PHONY): Add ps.
-	(ps, emacs.ps, emacs-xtra.ps): New targets.
-	(clean): Delete ps files.
+	(.PHONY): Add html, ps.
+	(html, emacs.html, ps, emacs.ps, emacs-xtra.ps): New targets.
+	(clean): Delete html, ps files.
 
 2010-10-09  Eli Zaretskii  <[email protected]>
 
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index d101b12e4e..1b13c042a8 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -115,10 +115,11 @@ EMACSSOURCES= \
 ## solution anyway.  The second test -d is for parallel builds.
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-.PHONY: info dvi pdf ps
+.PHONY: info dvi html pdf ps
 
 info: $(infodir)/emacs
 dvi: emacs.dvi
+html: emacs.html
 pdf: emacs.pdf
 ps: emacs.ps
 
@@ -139,6 +140,8 @@ emacs.ps: emacs.dvi
 emacs.pdf: ${EMACSSOURCES}
 	$(ENVADD) $(TEXI2PDF) $<
 
+emacs.html: ${EMACSSOURCES}
+	$(MAKEINFO) --html -o $@ $<
 
 emacs-xtra.dvi: $(EMACS_XTRA)
 	$(ENVADD) $(TEXI2DVI) $<
@@ -160,6 +163,7 @@ mostlyclean:
 clean: mostlyclean
 	rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf \
 	  emacs.ps emacs-xtra.ps
+	rm -rf emacs.html/
 	rm -f emacs-manual-${version}.tar*
 
 distclean: clean
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 87ce4dc7f6..cd63ecc10d 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -4,6 +4,7 @@
 	(.PHONY): Add ps.
 	(ps, emacs-lisp-intro.ps): New targets.
 	(clean): Delete ps file.
+	(MAKEINFO): Use --force like the other doc/ Makefiles do.
 
 2010-10-09  Glenn Morris  <[email protected]>
 
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 5fc7eb1723..c8bd224cf7 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -28,7 +28,7 @@ infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --force
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
@@ -48,7 +48,7 @@ ps: emacs-lisp-intro.ps
 # -NN extensions to fit into DOS 8+3 limits without clashing.
 ${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
 	$(mkinfodir)
-	$(MAKEINFO) $< -o $@
+	$(MAKEINFO) -o $@ $<
 
 emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
 	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3e3038ac60..213dfa7147 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,9 +1,10 @@
 2010-10-11  Glenn Morris  <[email protected]>
 
 	* Makefile.in (DVIPS): New variable.
-	(.PHONY): Add ps.
-	(ps, elisp.ps): New targets.
-	(clean): Delete ps file.
+	(.PHONY): Add html, ps.
+	(html, elisp.html, ps, elisp.ps): New targets.
+	(clean): Delete html, ps files.
+	($(infodir)/elisp): Remove unnecessary includes.
 
 2010-10-09  Eli Zaretskii  <[email protected]>
 
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 71ff3ec7a3..4ba9d82934 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -100,16 +100,20 @@ mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
 info: $(infodir)/elisp
 dvi: elisp.dvi
+html: elisp.html
 pdf: elisp.pdf
 ps: elisp.ps
 
 $(infodir)/elisp: $(srcs)
 	$(mkinfodir)
-	$(MAKEINFO) -I. -I$(texinfodir) $< -o $@
+	$(MAKEINFO) -o $@ $<
 
 elisp.dvi: $(srcs)
 	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
 
+elisp.html: $(srcs)
+	$(MAKEINFO) --html -o $@ $<
+
 elisp.ps: elisp.dvi
 	$(DVIPS) -o $@ $<
 
@@ -126,6 +130,7 @@ mostlyclean:
 
 clean: mostlyclean
 	rm -f elisp.dvi elisp.pdf elisp.ps vol[12].pdf
+	rm -rf elisp.html
 	rm -f emacs-lispref-${version}.tar*
 
 distclean: clean