]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix data-directory when executing from an out-of-source build
authorÓscar Fuentes <ofv@wanadoo.es>
Sat, 2 Nov 2019 17:01:01 +0000 (18:01 +0100)
committerÓscar Fuentes <ofv@wanadoo.es>
Sat, 2 Nov 2019 17:04:00 +0000 (18:04 +0100)
Fixes #36828.

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

src/callproc.c

index 007465cd4052a62e62a6e81e56c2c85ed1cafe8c..b51594c2d51d56061cb645c41ac47c54373b7897 100644 (file)
@@ -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);