procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* update-subdirs: Move to build-aux/.

Browse source 
* make-dist:
* Makefile.in (install-arch-indep):
* lisp/Makefile.in (update-subdirs):
* lisp/makefile.w32-in (update-subdirs-SH):
Update for this change.
This commit is contained in:
Glenn Morris 2012-05-21 16:40:55 -04:00
parent d10cfddd07
commit ff0c3cfb2f
7 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2012-05-21 Glenn Morris <rgm@gnu.org>
* 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.

2
Makefile.in
View file

@ -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 ; \

0
update-subdirs → build-aux/update-subdirs
View file

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-21 Glenn Morris <rgm@gnu.org>
* makefile.w32-in (update-subdirs-SH):
* Makefile.in (update-subdirs): Update for moved update-subdirs.
2012-05-21 Stefan Monnier <monnier@iro.umontreal.ca>
* hi-lock.el (hi-lock-face-defaults): Move obsolete before definition.

4
lisp/Makefile.in
View file

@ -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

6
lisp/makefile.w32-in
View file

@ -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

4
make-dist
View file

@ -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