Merge from mainline.

3 files changed, 18 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a90f2f406d..eb35ed93afc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (bzr-update): Renamed from cvs-update.
+        (cvs-update): New target for backward compatibility.
+
+        * makefile.w32-in (bzr-update): Renamed from cvs-update.
+        (cvs-update): New target for backward compatibility.
+
 2010-01-02  Karl Fogel  <kfogel@red-bean.com>
 
         * bookmark.el: Remove gratuitous gratitude.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index dfa3a98871e..93e75bc51ef 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -165,8 +165,11 @@ update-subdirs: doit
 
 updates: update-subdirs autoloads finder-data custom-deps
 
-# This is useful after "cvs up".
-cvs-update: recompile autoloads finder-data custom-deps
+# This is useful after "bzr up".
+bzr-update: recompile autoloads finder-data custom-deps
+
+# For backwards compatibility:
+cvs-update: bzr-update
 
 # Update the AUTHORS file.
 
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index ab079ea360c..aebf60030ae 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -233,8 +233,11 @@ update-subdirs-SH: doit
 
 updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
 
-# This is useful after "cvs up".
-cvs-update: recompile autoloads finder-data custom-deps
+# This is useful after "bzr up".
+bzr-update: recompile autoloads finder-data custom-deps
+
+# For backwards compatibility:
+cvs-update: bzr-update
 
 # Update the AUTHORS file.