[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114914: * lisp/Makefile.in (EMACS): Use a relative
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114914: * lisp/Makefile.in (EMACS): Use a relative filename. |
Date: |
Sat, 02 Nov 2013 20:05:20 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114914
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-02 13:05:15 -0700
message:
* lisp/Makefile.in (EMACS): Use a relative filename.
(custom-deps, finder-data, autoloads): Use --chdir.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-11-02 19:43:11 +0000
+++ b/lisp/ChangeLog 2013-11-02 20:05:15 +0000
@@ -1,5 +1,8 @@
2013-11-02 Glenn Morris <address@hidden>
+ * Makefile.in (EMACS): Use a relative filename.
+ (custom-deps, finder-data, autoloads): Use --chdir.
+
* Makefile.in (abs_lisp): Remove, replace by abs_srcdir.
Use relative filenames in TAGS files.
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2013-11-02 19:43:11 +0000
+++ b/lisp/Makefile.in 2013-11-02 20:05:15 +0000
@@ -33,10 +33,10 @@
# You can specify a different executable on the make command line,
# e.g. "make EMACS=../src/emacs ...".
-# We sometimes change directory before running Emacs (typically when
-# building out-of-tree, we chdir to the source directory), so we need
-# to use an absolute file name.
-EMACS = ${abs_top_builddir}/src/emacs
+# We never change directory before running Emacs, so a relative file
+# name is fine, and makes life easier. If we need to change
+# directory, we can use emacs --chdir.
+EMACS = ../src/emacs
# Command line flags for Emacs.
@@ -159,25 +159,26 @@
$(lisp)/cus-load.el:
$(MAKE) $(MFLAGS) custom-deps
custom-deps: doit
- cd $(lisp) && $(setwins_almost); \
+ thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
echo Directories: $$wins; \
- $(emacs) -l cus-dep -f custom-make-dependencies $$wins
+ $(emacs) --chdir $(lisp) -l cus-dep -f custom-make-dependencies $$wins
$(lisp)/finder-inf.el:
$(MAKE) $(MFLAGS) finder-data
finder-data: doit
- cd $(lisp) && $(setwins_almost); \
+ thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
echo Directories: $$wins; \
- $(emacs) -l finder -f finder-compile-keywords-make-dist $$wins
+ $(emacs) --chdir $(lisp) -l finder \
+ -f finder-compile-keywords-make-dist $$wins
# The chmod +w is to handle env var CVSREAD=1.
# Use expand-file-name rather than $abs_scrdir so that Emacs does not
# get confused when it compares file-names for equality.
autoloads: $(LOADDEFS) doit
cd $(lisp) && chmod +w $(AUTOGEN_VCS)
- cd $(lisp) && $(setwins_almost); \
+ thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
echo Directories: $$wins; \
- $(emacs) -l autoload \
+ $(emacs) --chdir $(lisp) -l autoload \
--eval '(setq autoload-builtin-package-versions t)' \
--eval '(setq generated-autoload-file (expand-file-name
"loaddefs.el"))' \
-f batch-update-autoloads $$wins
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114914: * lisp/Makefile.in (EMACS): Use a relative filename.,
Glenn Morris <=