* doc/emacs/ack.texi (Acknowledgments): Update emacs-lock info.

[gnu-emacs] / doc / emacs / Makefile.in

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index f3dbda1325c204009db7965ac8e192ded3910ceb..2ed265ecd70a3b1cbbe9701c2cb4247ccce9221c 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -1,8 +1,6 @@
 #### Makefile for the Emacs Manual
 
-# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-#   Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -40,7 +38,7 @@ texinfodir = $(srcdir)/../misc
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
 MAKEINFO = @MAKEINFO@
-MAKEINFO_OPTS = --force -I $(srcdir)
+MAKEINFO_OPTS = --force --enable-encoding -I $(srcdir)
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
@@ -86,7 +84,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 \
@@ -98,6 +96,7 @@ EMACSSOURCES= \
        ${srcdir}/dired.texi \
        ${srcdir}/calendar.texi \
        ${srcdir}/misc.texi \
+       ${srcdir}/package.texi \
        ${srcdir}/custom.texi \
        ${srcdir}/trouble.texi \
        ${srcdir}/cmdargs.texi \
@@ -113,7 +112,7 @@ EMACSSOURCES= \
 
 ## This seems pointless.  The info/ directory exists in both the
 ## repository and the release tarfiles.  We do not use any
-## equivalent of mkdir -p/mkinstalldirs, so this is not a general
+## equivalent of mkdir -p/install-sh -d, so this is not a general
 ## solution anyway.  The second test -d is for parallel builds.
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}