]> git.eshelyaron.com Git - emacs.git/commit
Fix NS native compilation builds
authorAlan Third <alan@idiocy.org>
Wed, 16 Jun 2021 20:28:10 +0000 (21:28 +0100)
committerAlan Third <alan@idiocy.org>
Sat, 26 Jun 2021 09:34:59 +0000 (10:34 +0100)
commit5dd2d50f3d5e65b85c87da86e2e8a6d087fe5767
treef8add442c328e37e5b8519415ed60d0c54523e65
parent4d63a033a726a8da33bda8d18a503e88bfb794fb
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.
Makefile.in
configure.ac
nextstep/Makefile.in
src/Makefile.in
src/callproc.c
src/emacs.c
src/lread.c
src/nsterm.h
src/nsterm.m