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 bbbcaf0..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.
 
@@ -28,7 +28,7 @@ infodir = $(srcdir)/../../info
 
 # The makeinfo program is part of the Texinfo distribution.
 MAKEINFO = makeinfo
-MAKEINFO_OPTS = --force -I$(srcdir)
+MAKEINFO_OPTS = --force --enable-encoding -I$(srcdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
 INFO_TARGETS = $(infodir)/emacs
 DVI_TARGETS =  emacs.dvi
@@ -76,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 \
@@ -88,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 \