diff options
| author | Glenn Morris | 2012-05-01 23:46:34 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-05-01 23:46:34 -0700 |
| commit | 3fef57a2f66ec269f8ed016ad5bf39f2346c6b54 (patch) | |
| tree | cbe50e7c235a15b9db42a3c1299f45d54594314b | |
| parent | 9e7a4bcfd87cc6403a86729d4cb17b6e3ec27443 (diff) | |
| download | emacs-3fef57a2f66ec269f8ed016ad5bf39f2346c6b54.tar.gz emacs-3fef57a2f66ec269f8ed016ad5bf39f2346c6b54.zip | |
* Makefile.in (INFO_FILES): Add emacs-gnutls;
accidentally omitted from 2012-04-12 backport from trunk.
(Do not merge to trunk.)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 2 |
2 files changed, 5 insertions, 2 deletions
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-05-02 Glenn Morris <rgm@gnu.org> | 1 | 2012-05-02 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally | ||
| 4 | omitted from 2012-04-12 backport from trunk. | ||
| 5 | |||
| 3 | * info/dir: Make some entries consistent with the source texi files. | 6 | * info/dir: Make some entries consistent with the source texi files. |
| 4 | 7 | ||
| 5 | * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04. | 8 | * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04. |
| @@ -10,7 +13,7 @@ | |||
| 10 | 13 | ||
| 11 | 2012-04-12 Teodor Zlatanov <tzz@lifelogs.com> | 14 | 2012-04-12 Teodor Zlatanov <tzz@lifelogs.com> |
| 12 | 15 | ||
| 13 | * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls. | 16 | * info/dir: Add emacs-gnutls. |
| 14 | 17 | ||
| 15 | 2012-03-04 Paul Eggert <eggert@cs.ucla.edu> | 18 | 2012-03-04 Paul Eggert <eggert@cs.ucla.edu> |
| 16 | 19 | ||
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 \ | |||
| 136 | # system, it is inappropriate to imply that it is part of Emacs. | 136 | # system, it is inappropriate to imply that it is part of Emacs. |
| 137 | infodir=@infodir@ | 137 | infodir=@infodir@ |
| 138 | INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ | 138 | INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ |
| 139 | ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \ | 139 | ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls emacs-mime epa erc \ |
| 140 | ert eshell eudc flymake forms gnus idlwave info mairix-el \ | 140 | ert eshell eudc flymake forms gnus idlwave info mairix-el \ |
| 141 | message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ | 141 | message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ |
| 142 | reftex remember sasl sc semantic ses sieve smtpmail speedbar \ | 142 | reftex remember sasl sc semantic ses sieve smtpmail speedbar \ |