[Emacs-diffs] /srv/bzr/emacs/trunk r108231: Make a self-contained ns build able to find its own libexec directory

[Glenn Morris]

------------------------------------------------------------
revno: 108231
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-14 09:33:11 -0700
message:
  Make a self-contained ns build able to find its own libexec directory
  
  Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00298.html
  
  * src/nsterm.m (ns_init_paths):
  Put "libexec" before "bin", for the sake of init_callproc_1.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-14 16:23:11 +0000
+++ b/src/ChangeLog     2012-05-14 16:33:11 +0000
@@ -1,6 +1,7 @@
 2012-05-14  Glenn Morris  <address@hidden>
 
        * nsterm.m (ns_init_paths): Fix typo ("libexec" not "lib-exec").
+       Put "libexec" before "bin", for the sake of init_callproc_1.
 
 2012-05-14  Paul Eggert  <address@hidden>
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-05-14 16:23:11 +0000
+++ b/src/nsterm.m      2012-05-14 16:33:11 +0000
@@ -338,11 +338,18 @@
 /*NSLog (@"loadPath: '%@'\n", resourcePaths); */
     }
 
+  /* Normally, Emacs does not add its own bin/ directory to the PATH.
+     However, a self-contained NS build has a different layout, with
+     bin/ and libexec/ subdirectories in the directory that contains
+     Emacs.app itself.
+     We put libexec first, because init_callproc_1 uses the first
+     element to initialize exec-directory.  An alternative would be
+     for init_callproc to check for invocation-directory/libexec.  */
   if (!getenv ("EMACSPATH"))
     {
       NSArray *paths = [binDir stringsByAppendingPaths:
-                                  [NSArray arrayWithObjects: @"bin",
-                                                             @"libexec", nil]];
+                                  [NSArray arrayWithObjects: @"libexec",
+                                                             @"bin", nil]];
       NSEnumerator *pathEnum = [paths objectEnumerator];
       resourcePaths = @"";
       while (resourcePath = [pathEnum nextObject])