Merge changes from emacs-23 branch

[gnu-emacs] / doc / emacs / makefile.w32-in

diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index c81e6fe47c105fcd8842826271e3883559a3ae06..bbbcaf0528bacb2d2327ebc885d71413e4d4d214 100644 (file)
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -1,7 +1,6 @@
 #### -*- Makefile -*- for the Emacs Manual
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+# Copyright (C) 2003-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -28,7 +27,8 @@ srcdir=.
 infodir = $(srcdir)/../../info
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo
+MAKEINFO_OPTS = --force -I$(srcdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
 INFO_TARGETS = $(infodir)/emacs
 DVI_TARGETS =  emacs.dvi
@@ -41,7 +41,7 @@ INFOSOURCES = info.texi
 
 TEXI2DVI = texi2dvi
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-        "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
+        "MAKEINFO=$(MAKEINFO) $(MAKEINFO_OPTS)" /C
 
 EMACS_XTRA=\
        $(srcdir)/arevert-xtra.texi \
@@ -51,12 +51,12 @@ EMACS_XTRA=\
        $(srcdir)/emerge-xtra.texi \
        $(srcdir)/vc-xtra.texi \
        $(srcdir)/vc1-xtra.texi \
-       $(srcdir)/vc2-xtra.texi \
        $(srcdir)/fortran-xtra.texi \
        $(srcdir)/msdog-xtra.texi
 
 EMACSSOURCES= \
        $(srcdir)/emacs.texi \
+       $(srcdir)/emacsver.texi \
        $(srcdir)/doclicense.texi \
        $(srcdir)/screen.texi \
        $(srcdir)/commands.texi \
@@ -114,11 +114,14 @@ $(infodir)/dir:
        $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
 
 $(infodir)/emacs: $(EMACSSOURCES)
-       $(MAKEINFO) emacs.texi
+       $(MAKEINFO) $(MAKEINFO_OPTS) emacs.texi
 
 emacs.dvi: $(EMACSSOURCES)
        $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi
 
+emacs.html: $(EMACSSOURCES)
+       $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ emacs.texi
+
 emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA)
        $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-xtra.texi
 
@@ -128,6 +131,7 @@ mostlyclean:
 clean: mostlyclean
        - $(DEL) *.dvi
        - $(DEL) $(infodir)/emacs*
+       - $(DEL_TREE) emacs.html
 
 distclean: clean
        - $(DEL) makefile