* Makefile.in (INFO_FILES): Add emacs-gnutls;

accidentally omitted from 2012-04-12 backport from trunk.
(Do not merge to trunk.)

diff --git a/ChangeLog b/ChangeLog
index 8f92ad7..46dff7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-02  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally
+       omitted from 2012-04-12 backport from trunk.
+
        * info/dir: Make some entries consistent with the source texi files.
 
        * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.
@@ -10,7 +13,7 @@
 
 2012-04-12  Teodor Zlatanov  <tzz@lifelogs.com>
 
-       * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls.
+       * info/dir: Add emacs-gnutls.
 
 2012-03-04  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/Makefile.in b/Makefile.in
index af0c902..d57c169 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,7 @@ MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
 # system, it is inappropriate to imply that it is part of Emacs.
 infodir=@infodir@
 INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse  \
-           ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
+           ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls emacs-mime epa erc \
           ert eshell eudc flymake forms gnus idlwave info mairix-el    \
           message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc      \
           reftex remember sasl sc semantic ses sieve smtpmail speedbar \