aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-07-05 21:31:54 -0400
committerGlenn Morris2012-07-05 21:31:54 -0400
commit60198fc97941a550ad74b3c9c4065d7902116cd8 (patch)
treebb5de57b44b20836071bc849c296873bc9cd7e24
parent8eb876e22c68e209e9bd4bb781cfacf4b1eee4c6 (diff)
downloademacs-60198fc97941a550ad74b3c9c4065d7902116cd8.tar.gz
emacs-60198fc97941a550ad74b3c9c4065d7902116cd8.zip
* lisp/Makefile.in (cvs-update): Remove old alias.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/Makefile.in7
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index adb14d5c75e..f3aa2953328 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-07-06 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (cvs-update): Remove old alias.
4
12012-07-05 Michael Albinus <michael.albinus@gmx.de> 52012-07-05 Michael Albinus <michael.albinus@gmx.de>
2 6
3 Sync with Tramp 2.2.6-pre. 7 Sync with Tramp 2.2.6-pre.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 6140b4fe953..d61988b333d 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -186,14 +186,13 @@ update-subdirs: doit
186 $(top_srcdir)/build-aux/update-subdirs $$file; \ 186 $(top_srcdir)/build-aux/update-subdirs $$file; \
187 done; 187 done;
188 188
189# Some modes of make-dist use this.
189updates: update-subdirs autoloads finder-data custom-deps 190updates: update-subdirs autoloads finder-data custom-deps
190 191
191# This is useful after "bzr up". 192# This is useful after "bzr up"; but it doesn't do anything that a
193# plain "make" at top-level doesn't.
192bzr-update: recompile autoloads finder-data custom-deps 194bzr-update: recompile autoloads finder-data custom-deps
193 195
194# For backwards compatibility:
195cvs-update: bzr-update
196
197# Update the AUTHORS file. 196# Update the AUTHORS file.
198 197
199update-authors: 198update-authors: