* src/nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2391a9b702293d8aaa3473151bc3738e28c5e8e7..4f196c4bec1bc189260f9eb41def52bd3df06d60 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-06-30  Glenn Morris  <rgm@gnu.org>
 
+       * nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp.
+
        * epaths.in (PATH_SITELOADSEARCH): New.
        * lread.c (init_lread): Use PATH_SITELOADSEARCH.
        This is rather than relying on --enable-locallisppath elements

diff --git a/src/nsterm.m b/src/nsterm.m
index c75b17135efc1657ba3715bdbb8d0ddb8e939abe..431577c4f019e30e8197cfb178ebebbda710b98a 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -320,6 +320,8 @@ ns_init_paths (void)
                                          @"site-lisp", @"lisp", @"leim", nil]];
       NSEnumerator *pathEnum = [paths objectEnumerator];
       resourcePaths = @"";
+      /* Hack to skip site-lisp.  */
+      if (no_site_lisp) resourcePath = [pathEnum nextObject];
       while (resourcePath = [pathEnum nextObject])
         {
           if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir])