Streamline init_callproc a bit

* src/callproc.c (init_callproc): Don’t bother testing for the
existence of ../src/ and NEWS if installation-directory is
non-nil, because in that case we will test for ../etc/NEWS anyway.
Simplify by using AUTO_STR.

1 files changed, 8 insertions, 10 deletions

diff --git a/src/callproc.c b/src/callproc.c
index e1a369b47f4..8a8cdf813ce 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -2009,19 +2009,17 @@ init_callproc (void)
      source directory.  */
   if (data_dir == 0)
     {
-      Lisp_Object tem, srcdir;
       Lisp_Object lispdir = Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH, 0));
-
-      srcdir = Fexpand_file_name (build_string ("../src/"), lispdir);
-
-      tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory);
-      if (!NILP (Fequal (srcdir, Vinvocation_directory))
-          || NILP (Ffile_exists_p (tem)) || !NILP (Vinstallation_directory))
+      if (!NILP (Vinstallation_directory)
+          || !NILP (Fequal (Fexpand_file_name (AUTO_STR ("../src/"), lispdir),
+                            Vinvocation_directory))
+          || NILP (Ffile_exists_p (Fexpand_file_name (AUTO_STR ("NEWS"),
+                                                      Vdata_directory))))
         {
           Lisp_Object newdir;
-          newdir = Fexpand_file_name (build_string ("../etc/"), lispdir);
-          tem = Fexpand_file_name (build_string ("NEWS"), newdir);
-          if (!NILP (Ffile_exists_p (tem)))
+          newdir = Fexpand_file_name (AUTO_STR ("../etc/"), lispdir);
+          if (!NILP (Ffile_exists_p (Fexpand_file_name (AUTO_STR ("NEWS"),
+                                                        newdir))))
             Vdata_directory = newdir;
         }
     }