[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115000: Remove some directory-changing in lisp/Make
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r115000: Remove some directory-changing in lisp/Makefile |
Date: |
Wed, 06 Nov 2013 08:37:08 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115000
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-06 00:37:01 -0800
message:
Remove some directory-changing in lisp/Makefile
* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs): Simplify.
(setwins_almost, setwins_for_subdirs): Don't assume called from srcdir.
(custom-deps, finder-data, autoloads, update-subdirs): No need to cd.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-11-06 08:09:15 +0000
+++ b/lisp/ChangeLog 2013-11-06 08:37:01 +0000
@@ -1,6 +1,8 @@
2013-11-06 Glenn Morris <address@hidden>
* Makefile.in (setwins, setwins_almost, setwins_for_subdirs): Simplify.
+ (setwins_almost, setwins_for_subdirs): Don't assume called from srcdir.
+ (custom-deps, finder-data, autoloads, update-subdirs): No need to cd.
2013-11-06 Stefan Monnier <address@hidden>
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2013-11-06 08:09:15 +0000
+++ b/lisp/Makefile.in 2013-11-06 08:37:01 +0000
@@ -113,18 +113,18 @@
case $$file in */.* ) ;; \
*) wins="$$wins$${wins:+ }$$file" ;; \
esac; \
- done
+ done
# Find all subdirectories except `obsolete' and `term'.
-setwins_almost=for file in `find . -type d -print`; do \
- case $$file in */.* | */obsolete | */term ) ;; \
+setwins_almost=for file in `find ${srcdir} -type d -print`; do \
+ case $$file in */obsolete | */term ) ;; \
*) wins="$$wins$${wins:+ }$$file" ;; \
esac; \
done
-# Find all subdirectories in which we might want to create subdirs.el
-setwins_for_subdirs=for file in `find . -type d -print`; do \
- case $$file in */.* | */cedet* ) ;; \
+# Find all subdirectories in which we might want to create subdirs.el.
+setwins_for_subdirs=for file in `find ${srcdir} -type d -print`; do \
+ case $$file in */cedet* ) ;; \
*) wins="$$wins$${wins:+ }$$file" ;; \
esac; \
done
@@ -154,16 +154,19 @@
$(lisp)/cus-load.el:
$(MAKE) $(MFLAGS) custom-deps
custom-deps: doit
- thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
+ $(setwins_almost); \
echo Directories: $$wins; \
- $(emacs) --chdir $(lisp) -l cus-dep -f custom-make-dependencies $$wins
+ $(emacs) -l cus-dep \
+ --eval '(setq generated-custom-dependencies-file
"$(srcdir)/cus-load.el")' \
+ -f custom-make-dependencies $$wins
$(lisp)/finder-inf.el:
$(MAKE) $(MFLAGS) finder-data
finder-data: doit
- thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
+ $(setwins_almost); \
echo Directories: $$wins; \
- $(emacs) --chdir $(lisp) -l finder \
+ $(emacs) -l finder \
+ --eval '(setq generated-finder-keywords-file
"$(srcdir)/finder-inf.el")' \
-f finder-compile-keywords-make-dist $$wins
# The chmod +w is to handle env var CVSREAD=1.
@@ -171,11 +174,11 @@
# get confused when it compares file-names for equality.
autoloads: $(LOADDEFS) doit
cd $(lisp) && chmod +w $(AUTOGEN_VCS)
- thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
+ $(setwins_almost); \
echo Directories: $$wins; \
- $(emacs) --chdir $(lisp) -l autoload \
+ $(emacs) -l autoload \
--eval '(setq autoload-builtin-package-versions t)' \
- --eval '(setq generated-autoload-file (expand-file-name
"loaddefs.el"))' \
+ --eval '(setq generated-autoload-file (expand-file-name
"$(srcdir)/loaddefs.el"))' \
-f batch-update-autoloads $$wins
# This is required by the bootstrap-emacs target in ../src/Makefile, so
@@ -183,9 +186,9 @@
$(lisp)/subdirs.el:
$(MAKE) $(MFLAGS) update-subdirs
update-subdirs: doit
- cd $(lisp) && $(setwins_for_subdirs); \
+ $(setwins_for_subdirs); \
for file in $$wins; do \
- ../build-aux/update-subdirs $$file; \
+ $(srcdir)/../build-aux/update-subdirs $$file; \
done;
.PHONY: updates bzr-update update-authors
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115000: Remove some directory-changing in lisp/Makefile,
Glenn Morris <=