aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorÓscar Fuentes2019-11-02 18:01:01 +0100
committerÓscar Fuentes2019-11-02 18:04:00 +0100
commite6b806f29e06e472a44763def6b4d904b5f1ba54 (patch)
treef9e68588b95bd13e54f1cdfd52861f4798656cc4 /src
parentadb5f45d7bc4612916a5b8e4bd2b92d49119b57a (diff)
downloademacs-e6b806f29e06e472a44763def6b4d904b5f1ba54.tar.gz
emacs-e6b806f29e06e472a44763def6b4d904b5f1ba54.zip
Fix data-directory when executing from an out-of-source build
Fixes #36828. * src/callproc.c (init_callproc): detect out-of-source build.
Diffstat (limited to 'src')
-rw-r--r--src/callproc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 007465cd405..b51594c2d51 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1567,7 +1567,7 @@ init_callproc (void)
1567 1567
1568 tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory); 1568 tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory);
1569 if (!NILP (Fequal (srcdir, Vinvocation_directory)) 1569 if (!NILP (Fequal (srcdir, Vinvocation_directory))
1570 || NILP (Ffile_exists_p (tem))) 1570 || NILP (Ffile_exists_p (tem)) || !NILP (Vinstallation_directory))
1571 { 1571 {
1572 Lisp_Object newdir; 1572 Lisp_Object newdir;
1573 newdir = Fexpand_file_name (build_string ("../etc/"), lispdir); 1573 newdir = Fexpand_file_name (build_string ("../etc/"), lispdir);