diff options
| author | Glenn Morris | 2012-08-09 20:47:21 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-08-09 20:47:21 -0400 |
| commit | 4b94e8cfe59df775a3eb510ec67764e22c91ebd5 (patch) | |
| tree | d6895f18394eb372562bab87e7e71f6fc6bcec9a /src | |
| parent | 9748df5d771df91aa4caf534a3ed3a6682f1bfcb (diff) | |
| download | emacs-4b94e8cfe59df775a3eb510ec67764e22c91ebd5.tar.gz emacs-4b94e8cfe59df775a3eb510ec67764e22c91ebd5.zip | |
* src/Makefile.in (config_h): Fix conf_post.h out-of-tree build location.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
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 @@ | |||
| 1 | 2012-08-10 Glenn Morris <rgm@gnu.org> | 1 | 2012-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 | ||
| 5 | 2012-08-09 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2012-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 | |||
| 56 | lispdir = ../lisp | 56 | lispdir = ../lisp |
| 57 | 57 | ||
| 58 | # Configuration files for .o files to depend on. | 58 | # Configuration files for .o files to depend on. |
| 59 | config_h = config.h conf_post.h | 59 | config_h = config.h $(srcdir)/conf_post.h |
| 60 | 60 | ||
| 61 | bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) | 61 | bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) |
| 62 | 62 | ||