From: Óscar Fuentes <ofv@wanadoo.es>
Date: Sat, 2 Nov 2019 17:01:01 +0000 (+0100)
Subject: Fix data-directory when executing from an out-of-source build
X-Git-Tag: emacs-27.0.90~759
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6b806f29e06e472a44763def6b4d904b5f1ba54;p=emacs.git

Fix data-directory when executing from an out-of-source build

Fixes #36828.

* src/callproc.c (init_callproc): detect out-of-source build.
---

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)
 
       tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory);
       if (!NILP (Fequal (srcdir, Vinvocation_directory))
-	  || NILP (Ffile_exists_p (tem)))
+	  || NILP (Ffile_exists_p (tem)) || !NILP (Vinstallation_directory))
 	{
 	  Lisp_Object newdir;
 	  newdir = Fexpand_file_name (build_string ("../etc/"), lispdir);