emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master e6b806f: Fix data-directory when executing from an out-of-source


From: Oscar Fuentes
Subject: master e6b806f: Fix data-directory when executing from an out-of-source build
Date: Sat, 2 Nov 2019 13:04:28 -0400 (EDT)

branch: master
commit e6b806f29e06e472a44763def6b4d904b5f1ba54
Author: Óscar Fuentes <address@hidden>
Commit: Óscar Fuentes <address@hidden>

    Fix data-directory when executing from an out-of-source build
    
    Fixes #36828.
    
    * src/callproc.c (init_callproc): detect out-of-source build.
---
 src/callproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/callproc.c b/src/callproc.c
index 007465c..b51594c 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);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]