From 3fef57a2f66ec269f8ed016ad5bf39f2346c6b54 Mon Sep 17 00:00:00 2001 From: Glenn Morris <rgm@gnu.org> Date: Tue, 1 May 2012 23:46:34 -0700 Subject: [PATCH] * Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally omitted from 2012-04-12 backport from trunk. (Do not merge to trunk.) --- ChangeLog | 5 ++++- Makefile.in | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f92ad7896d..46dff7c807f 100644 --- 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 af0c902b381..d57c1690f47 100644 --- 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 \ -- 2.39.5