[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108331: * update-subdirs: Move to build-aux/.

[Glenn Morris]

------------------------------------------------------------
revno: 108331
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-21 16:40:55 -0400
message:
  * update-subdirs: Move to build-aux/.
  
  * make-dist:
  * Makefile.in (install-arch-indep):
  * lisp/Makefile.in (update-subdirs):
  * lisp/makefile.w32-in (update-subdirs-SH):
  Update for this change.
renamed:
  update-subdirs => build-aux/update-subdirs
modified:
  ChangeLog
  Makefile.in
  lisp/ChangeLog
  lisp/Makefile.in
  lisp/makefile.w32-in
  make-dist

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-21 20:13:49 +0000
+++ b/ChangeLog 2012-05-21 20:40:55 +0000
@@ -1,5 +1,8 @@
 2012-05-21  Glenn Morris  <address@hidden>
 
+       * update-subdirs: Move to build-aux/.
+       * make-dist, Makefile.in (install-arch-indep): Update for this change.
+
        * Makefile.in (leimdir): New, set by configure.
        (COPYDIR, COPYDESTS): Add leim directories.
        (install-leim): Remove.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-21 20:13:49 +0000
+++ b/Makefile.in       2012-05-21 20:40:55 +0000
@@ -523,7 +523,7 @@
        -rm -f $(DESTDIR)${leimdir}/leim-list.el
        ${INSTALL_DATA} leim/leim-list.el $(DESTDIR)${leimdir}/leim-list.el
        -rm -f $(DESTDIR)${lispdir}/subdirs.el
-       umask 022; $(srcdir)/update-subdirs $(DESTDIR)${lispdir}
+       umask 022; $(srcdir)/build-aux/update-subdirs $(DESTDIR)${lispdir}
        subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \
          ${write_subdir}
        subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \

=== renamed file 'update-subdirs' => 'build-aux/update-subdirs'
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-21 04:33:54 +0000
+++ b/lisp/ChangeLog    2012-05-21 20:40:55 +0000
@@ -1,3 +1,8 @@
+2012-05-21  Glenn Morris  <address@hidden>
+
+       * makefile.w32-in (update-subdirs-SH):
+       * Makefile.in (update-subdirs): Update for moved update-subdirs.
+
 2012-05-21  Stefan Monnier  <address@hidden>
 
        * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition.

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2012-05-21 00:44:34 +0000
+++ b/lisp/Makefile.in  2012-05-21 20:40:55 +0000
@@ -1,5 +1,5 @@
 # Maintenance productions for the Lisp directory
-# Copyright (C) 2000-2012  Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -179,7 +179,7 @@
 update-subdirs: doit
        cd $(lisp); $(setwins_for_subdirs); \
        for file in $$wins; do \
-          $(top_srcdir)/update-subdirs $$file; \
+          $(top_srcdir)/build-aux/update-subdirs $$file; \
        done;
 
 updates: update-subdirs autoloads finder-data custom-deps

=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in      2012-03-25 18:17:46 +0000
+++ b/lisp/makefile.w32-in      2012-05-21 20:40:55 +0000
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000-2012  Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -243,9 +243,9 @@
        echo ;; End:>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit
-       $(srcdir)/update-subdirs $(lisp); \
+       $(srcdir)/build-aux/update-subdirs $(lisp); \
        for file in $(WINS_SUBDIR); do \
-          $(srcdir)/update-subdirs $$file; \
+          $(srcdir)/build-aux/update-subdirs $$file; \
        done;
 
 updates: update-subdirs autoloads mh-autoloads finder-data custom-deps

=== modified file 'make-dist'
--- a/make-dist 2012-05-21 19:16:27 +0000
+++ b/make-dist 2012-05-21 20:40:55 +0000
@@ -285,7 +285,7 @@
 echo "Making links to top-level files"
 ln INSTALL README BUGS ${tempdir}
 ln ChangeLog Makefile.in configure configure.in ${tempdir}
-ln config.bat make-dist update-subdirs .dir-locals.el ${tempdir}
+ln config.bat make-dist .dir-locals.el ${tempdir}
 ln aclocal.m4 ${tempdir}
 
 echo "Creating subdirectories"
@@ -346,7 +346,7 @@
 echo "Making links to \`build-aux'"
 (cd build-aux
  ln compile config.guess config.sub depcomp ../${tempdir}/build-aux
- ln install-sh missing move-if-change ../${tempdir}/build-aux)
+ ln install-sh missing move-if-change update-subdirs ../${tempdir}/build-aux)
 
 echo "Making links to \`build-aux/snippet'"
 (cd build-aux/snippet