From ff0c3cfb2ff6e16f601d3745b9302bf9486a7c0f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 21 May 2012 16:40:55 -0400 Subject: [PATCH] * 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. --- ChangeLog | 3 +++ Makefile.in | 2 +- update-subdirs => build-aux/update-subdirs | 0 lisp/ChangeLog | 5 +++++ lisp/Makefile.in | 4 ++-- lisp/makefile.w32-in | 6 +++--- make-dist | 4 ++-- 7 files changed, 16 insertions(+), 8 deletions(-) rename update-subdirs => build-aux/update-subdirs (100%) diff --git a/ChangeLog b/ChangeLog index dcd8559d7b7..f25e9c3681e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-05-21 Glenn Morris + * 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. diff --git a/Makefile.in b/Makefile.in index 2db87aef6ce..763a3644fcd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -523,7 +523,7 @@ install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} -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 ; \ diff --git a/update-subdirs b/build-aux/update-subdirs similarity index 100% rename from update-subdirs rename to build-aux/update-subdirs diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7775422417..abf0bb66b2e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Glenn Morris + + * makefile.w32-in (update-subdirs-SH): + * Makefile.in (update-subdirs): Update for moved update-subdirs. + 2012-05-21 Stefan Monnier * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index ff211589f49..29ef8e40abe 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -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 @@ $(lisp)/subdirs.el: 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 diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 7907c5f10ce..6cb8b3dd495 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -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 @@ update-subdirs-CMD: doit 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 diff --git a/make-dist b/make-dist index 1e8fc9178f1..0a12a630526 100755 --- a/make-dist +++ b/make-dist @@ -285,7 +285,7 @@ mkdir ${tempdir} 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 \`leim' and its subdirectories" 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 -- 2.39.2