aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in12
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc5fae78970..b4dc92d442e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-10-31 Eli Zaretskii <eliz@gnu.org>
2
3 * Makefile.in (repo-update): Fix a typo and slightly reword
4 commentary.
5
12014-10-31 Glenn Morris <rgm@gnu.org> 62014-10-31 Glenn Morris <rgm@gnu.org>
2 7
3 * version.el (emacs-bzr-version, emacs-bzr-get-version): 8 * version.el (emacs-bzr-version, emacs-bzr-get-version):
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index d90ced0cdcb..0f2c38b08bf 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -211,12 +211,12 @@ update-subdirs: doit
211# Some modes of make-dist use this. 211# Some modes of make-dist use this.
212updates: update-subdirs autoloads finder-data custom-deps 212updates: update-subdirs autoloads finder-data custom-deps
213 213
214# This is useful after a repostiory fetch; but it doesn't do anything that a 214# This is useful after updating from the repository; but it doesn't do
215# plain "make" at top-level doesn't. 215# anything that a plain "make" at top-level doesn't. The only
216# The only difference between this and this directory's "all" rule 216# difference between this and this directory's "all" rule is that this
217# is that this runs "autoloads" as well (because it uses "compile" 217# runs "autoloads" as well (because it uses "compile" rather than
218# rather than "compile-main"). In a bootstrap, $(lisp) in src/Makefile 218# "compile-main"). In a bootstrap, $(lisp) in src/Makefile triggers
219# triggers this directory's autoloads rule. 219# this directory's autoloads rule.
220repo-update: compile finder-data custom-deps 220repo-update: compile finder-data custom-deps
221 221
222# Update the AUTHORS file. 222# Update the AUTHORS file.