aboutsummaryrefslogtreecommitdiffstats
path: root/src/lread.c
diff options
context:
space:
mode:
authorAlan Third2021-06-16 21:28:10 +0100
committerAlan Third2021-06-26 10:34:59 +0100
commit5dd2d50f3d5e65b85c87da86e2e8a6d087fe5767 (patch)
treef8add442c328e37e5b8519415ed60d0c54523e65 /src/lread.c
parent4d63a033a726a8da33bda8d18a503e88bfb794fb (diff)
downloademacs-5dd2d50f3d5e65b85c87da86e2e8a6d087fe5767.tar.gz
emacs-5dd2d50f3d5e65b85c87da86e2e8a6d087fe5767.zip
Fix NS native compilation builds
* Makefile.in (ns_applibexecdir): (ns_applibdir): (ns_appdir): New variables. (.PHONY): Include new rule. (epaths-force-ns-self-contained): Remove the app bundle directory from all paths. * configure.ac (NS_SELF_CONTAINED): Set the default site-lisp directory instead of hard-coding it in the ObjC code, and use the new epaths generating make rule. * src/callproc.c (init_callproc_1): (init_callproc): Remove all the NS specific code as the special cases are now handled by decode_env_path. * src/emacs.c (load_pdump): (decode_env_path): Use ns_relocate to find the correct directory after relocation. * src/lread.c (load_path_default): Remove all the NS specific code as the special cases are now handled by decode_env_path. * src/nsterm.h: Update function definitions. * src/nsterm.m (ns_etc_directory): (ns_exec_path): (ns_load_path): Remove functions that are no longer needed. (ns_relocate): New function to calculate paths within the NS app bundle. * nextstep/Makefile.in (ns_applibexecdir): New variable, and update anything relying on the libexec location.
Diffstat (limited to 'src/lread.c')
-rw-r--r--src/lread.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lread.c b/src/lread.c
index 0b33fd0f254..4617ffd6265 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4769,14 +4769,9 @@ load_path_default (void)
4769 return decode_env_path (0, PATH_DUMPLOADSEARCH, 0); 4769 return decode_env_path (0, PATH_DUMPLOADSEARCH, 0);
4770 4770
4771 Lisp_Object lpath = Qnil; 4771 Lisp_Object lpath = Qnil;
4772 const char *normal = PATH_LOADSEARCH;
4773 const char *loadpath = NULL; 4772 const char *loadpath = NULL;
4774 4773
4775#ifdef HAVE_NS 4774 lpath = decode_env_path (0, PATH_LOADSEARCH, 0);
4776 loadpath = ns_load_path ();
4777#endif
4778
4779 lpath = decode_env_path (0, loadpath ? loadpath : normal, 0);
4780 4775
4781 if (!NILP (Vinstallation_directory)) 4776 if (!NILP (Vinstallation_directory))
4782 { 4777 {