Merge changes from emacs-23 branch

[bpt/emacs.git] / doc / emacs / makefile.w32-in

diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index 422ae26..488ccba 100644 (file)
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -1,6 +1,6 @@
 #### -*- Makefile -*- for the Emacs Manual
 
-# Copyright (C) 2003-2011  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -27,7 +27,8 @@ srcdir=.
 infodir = $(srcdir)/../../info
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo
+MAKEINFO_OPTS = --force --enable-encoding -I$(srcdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
 INFO_TARGETS = $(infodir)/emacs
 DVI_TARGETS =  emacs.dvi
@@ -40,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 \
@@ -75,7 +76,7 @@ EMACSSOURCES= \
        $(srcdir)/windows.texi \
        $(srcdir)/frames.texi \
        $(srcdir)/mule.texi \
-       $(srcdir)/major.texi \
+       $(srcdir)/modes.texi \
        $(srcdir)/indent.texi \
        $(srcdir)/text.texi \
        $(srcdir)/programs.texi \
@@ -87,6 +88,7 @@ EMACSSOURCES= \
        $(srcdir)/dired.texi \
        $(srcdir)/calendar.texi \
        $(srcdir)/misc.texi \
+       $(srcdir)/package.texi \
        $(srcdir)/custom.texi \
        $(srcdir)/trouble.texi \
        $(srcdir)/cmdargs.texi \
@@ -113,11 +115,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
 
@@ -127,6 +132,7 @@ mostlyclean:
 clean: mostlyclean
        - $(DEL) *.dvi
        - $(DEL) $(infodir)/emacs*
+       - $(DEL_TREE) emacs.html
 
 distclean: clean
        - $(DEL) makefile