procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make a self-contained ns build able to find its own libexec directory

Browse source 
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.
This commit is contained in:
Glenn Morris 2012-05-14 09:33:11 -07:00
parent 4374de8319
commit 985584aed1
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/ChangeLog
View file

@ -1,6 +1,7 @@
2012-05-14 Glenn Morris <rgm@gnu.org>
* 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 <eggert@cs.ucla.edu>

11
src/nsterm.m
View file

@ -338,11 +338,18 @@ Updated by Christian Limpach (chris@nice.ch)
/*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])