aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/Makefile.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3427f449586..bd43b7ba05e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12012-08-10 Glenn Morris <rgm@gnu.org> 12012-08-10 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (config_h): Fix conf_post.h out-of-tree build location.
4
3 * lisp.h (DIRECTORY_SEP): Let configure set it. 5 * lisp.h (DIRECTORY_SEP): Let configure set it.
4 6
52012-08-09 Dmitry Antipov <dmantipov@yandex.ru> 72012-08-09 Dmitry Antipov <dmantipov@yandex.ru>
diff --git a/src/Makefile.in b/src/Makefile.in
index 687b3ce9aac..4b1520ada62 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,7 +56,7 @@ lwlibdir = ../lwlib
56lispdir = ../lisp 56lispdir = ../lisp
57 57
58# Configuration files for .o files to depend on. 58# Configuration files for .o files to depend on.
59config_h = config.h conf_post.h 59config_h = config.h $(srcdir)/conf_post.h
60 60
61bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) 61bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT)
62 62