diff options
| author | Alan Third <alan@idiocy.org> | 2021-04-02 18:06:59 +0100 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2021-04-07 09:06:00 +0100 |
| commit | c35a515a2f7045f004299f601f6d1927ea16cd47 (patch) | |
| tree | 26c99f37400e8a721b484a2c08e304f8cedbb53e /Makefile.in | |
| parent | ce15b23846cd82acccb6ce5dd13b0a42f487296b (diff) | |
| download | emacs-c35a515a2f7045f004299f601f6d1927ea16cd47.tar.gz | |
Fix install with NS app bundle
* configure.ac: Set up CFLAGS and LDFLAGS to find a Homebrew
installation of libgccjit.
* Makefile.in (ELN_DESTDIR): Set to the app bundle resource dir when
required.
(install-eln): macOS install doesn't support the -D flag, so make the
directories separately.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index e318db746d6..efe89b9b93e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -323,10 +323,11 @@ COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" ifeq (${ns_self_contained},no) BIN_DESTDIR='$(DESTDIR)${bindir}/' +ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/ else BIN_DESTDIR='${ns_appbindir}/' +ELN_DESTDIR = ${ns_appresdir}/ endif -ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/ all: ${SUBDIR} info @@ -752,7 +753,8 @@ install-etc: ### Install native compiled Lisp files. install-eln: ifeq ($(HAVE_NATIVE_COMP),yes) - find native-lisp -type f -exec ${INSTALL_DATA} -D "{}" "$(ELN_DESTDIR){}" \; + find native-lisp -type d -exec $(MKDIR_P) "$(ELN_DESTDIR){}" \; ; \ + find native-lisp -type f -exec ${INSTALL_DATA} "{}" "$(ELN_DESTDIR){}" \; endif ### Build Emacs and install it, stripping binaries while installing them. |