Merge from origin/emacs-28

2eb738f2b8 Support builds configured with a separate --bindir
cf4c204df8 * doc/misc/eww.texi (Overview, Basics): Fix typos.

1 files changed, 18 insertions, 14 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 236add1157d..5098acd7225 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -975,20 +975,24 @@ load_pdump (int argc, char **argv)
   sprintf (dump_file, "%s%c%s-%s%s",
            path_exec, DIRECTORY_SEP, argv0_base, hexbuf, suffix);
 #if !defined (NS_SELF_CONTAINED)
-  /* Assume the Emacs binary lives in a sibling directory as set up by
-     the default installation configuration.  */
-  const char *go_up = "../../../../bin/";
-  needed += (strip_suffix ? strlen (strip_suffix) : 0)
-    - strlen (suffix) + strlen (go_up);
-  if (exec_bufsize < needed)
-    {
-      xfree (emacs_executable);
-      emacs_executable = xpalloc (NULL, &exec_bufsize, needed - exec_bufsize,
-                                  -1, 1);
-    }
-  sprintf (emacs_executable, "%s%c%s%s%s",
-           path_exec, DIRECTORY_SEP, go_up, argv0_base,
-           strip_suffix ? strip_suffix : "");
+  if (!(emacs_executable && *emacs_executable))
+    {
+      /* If we didn't find the Emacs binary, assume that it lives in a
+         sibling directory as set up by the default installation
+         configuration.  */
+      const char *go_up = "../../../../bin/";
+      needed += (strip_suffix ? strlen (strip_suffix) : 0)
+        - strlen (suffix) + strlen (go_up);
+      if (exec_bufsize < needed)
+        {
+          xfree (emacs_executable);
+          emacs_executable = xpalloc (NULL, &exec_bufsize,
+                                      needed - exec_bufsize, -1, 1);
+        }
+      sprintf (emacs_executable, "%s%c%s%s%s",
+               path_exec, DIRECTORY_SEP, go_up, argv0_base,
+               strip_suffix ? strip_suffix : "");
+    }
 #endif
   result = pdumper_load (dump_file, emacs_executable);