aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2013-10-23 18:52:44 -0700
committerGlenn Morris2013-10-23 18:52:44 -0700
commit6f317c2faaa9aa00f2f9460e1d3dd45041583684 (patch)
tree7c05a492b700f1b0f268ec1fce9f52d53e0660d2 /lisp
parent8297b2cfdd3c0da92cc6625205f4533fcb3b01e9 (diff)
downloademacs-6f317c2faaa9aa00f2f9460e1d3dd45041583684.tar.gz
emacs-6f317c2faaa9aa00f2f9460e1d3dd45041583684.zip
* lisp/Makefile.in (abs_top_srcdir): New, set by configure.
(update-subdirs): Correct build-aux location.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e34bc5ef2e..16b88cf8f6e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-10-24 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (abs_top_srcdir): New, set by configure.
4 (update-subdirs): Correct build-aux location.
5
12013-10-24 Dmitry Gutov <dgutov@yandex.ru> 62013-10-24 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * vc/vc.el (vc-print-root-log): Always set `default-directory' 8 * vc/vc.el (vc-print-root-log): Always set `default-directory'
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 814aefc0cc0..58610387ac3 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -22,6 +22,7 @@ SHELL = @SHELL@
22srcdir = @srcdir@ 22srcdir = @srcdir@
23abs_srcdir = @abs_srcdir@ 23abs_srcdir = @abs_srcdir@
24top_srcdir = @top_srcdir@ 24top_srcdir = @top_srcdir@
25abs_top_srcdir = @abs_top_srcdir@
25abs_top_builddir = @abs_top_builddir@ 26abs_top_builddir = @abs_top_builddir@
26abs_lisp = $(abs_srcdir) 27abs_lisp = $(abs_srcdir)
27lisp = $(srcdir) 28lisp = $(srcdir)
@@ -193,7 +194,7 @@ $(lisp)/subdirs.el:
193update-subdirs: doit 194update-subdirs: doit
194 cd $(lisp); $(setwins_for_subdirs); \ 195 cd $(lisp); $(setwins_for_subdirs); \
195 for file in $$wins; do \ 196 for file in $$wins; do \
196 $(top_srcdir)/build-aux/update-subdirs $$file; \ 197 $(abs_top_srcdir)/build-aux/update-subdirs $$file; \
197 done; 198 done;
198 199
199.PHONY: updates bzr-update update-authors 200.PHONY: updates bzr-update update-authors