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.
-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 ; \
--- /dev/null
+#!/bin/sh
+# Write into $1/subdirs.el a list of subdirs of directory $1.
+
+# Copyright (C) 1994-1995, 1997, 1999, 2001-2012
+# Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+
+cd $1
+for file in *; do
+ case $file in
+ *.elc | *.el | term | RCS | CVS | Old | . | .. | =* | *~ | *.orig | *.rej)
+ ;;
+ *)
+ if [ -d $file ]; then
+ if [ "$file" = "obsolete" ]; then
+ subdirs="$subdirs \"$file\""
+ else
+ subdirs="\"$file\" $subdirs"
+ fi
+ fi
+ ;;
+ esac
+done
+
+if [ "x$subdirs" = x ]; then
+ rm -f subdirs.el
+else
+ rm -f subdirs.el~
+ echo ";; In load-path, after this directory should come
+;; certain of its subdirectories. Here we specify them.
+(normal-top-level-add-to-load-path '($subdirs))
+;; Local" "Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; End:" > subdirs.el~
+ if cmp "subdirs.el" "subdirs.el~" >/dev/null 2>&1; then
+ :; # echo "subdirs.el unchanged";
+ else
+ mv subdirs.el~ subdirs.el
+ fi
+fi
+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.
# 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.
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
# -*- 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.
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
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"
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
+++ /dev/null
-#!/bin/sh
-# Write into $1/subdirs.el a list of subdirs of directory $1.
-
-# Copyright (C) 1994-1995, 1997, 1999, 2001-2012
-# Free Software Foundation, Inc.
-
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-
-cd $1
-for file in *; do
- case $file in
- *.elc | *.el | term | RCS | CVS | Old | . | .. | =* | *~ | *.orig | *.rej)
- ;;
- *)
- if [ -d $file ]; then
- if [ "$file" = "obsolete" ]; then
- subdirs="$subdirs \"$file\""
- else
- subdirs="\"$file\" $subdirs"
- fi
- fi
- ;;
- esac
-done
-
-if [ "x$subdirs" = x ]; then
- rm -f subdirs.el
-else
- rm -f subdirs.el~
- echo ";; In load-path, after this directory should come
-;; certain of its subdirectories. Here we specify them.
-(normal-top-level-add-to-load-path '($subdirs))
-;; Local" "Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; End:" > subdirs.el~
- if cmp "subdirs.el" "subdirs.el~" >/dev/null 2>&1; then
- :; # echo "subdirs.el unchanged";
- else
- mv subdirs.el~ subdirs.el
- fi
-fi
projects / emacs.git / commitdiff