[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d0b1e3647fb: macOS: only cp emacs.pdmp when installing (bug#66022
From: |
Gerd Moellmann |
Subject: |
master d0b1e3647fb: macOS: only cp emacs.pdmp when installing (bug#66022) |
Date: |
Thu, 21 Sep 2023 01:10:10 -0400 (EDT) |
branch: master
commit d0b1e3647fb4e6d889f9f999388c53daf0e67f0d
Author: Gerd Möllmann <gerd@gnu.org>
Commit: Gerd Möllmann <gerd@gnu.org>
macOS: only cp emacs.pdmp when installing (bug#66022)
* Makefile.in (install-arch-dep): install emacs.pdmp here for
self-contained build
* nextstep/Makefile.in (${ns_applibexecdir}/Emacs.pdmp): Don't cp
emacs.pdmp if self-contained build.
---
Makefile.in | 1 +
nextstep/Makefile.in | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index c82aad1af60..51a27cc1814 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -643,6 +643,7 @@ ifndef NO_BIN_LINK
cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)"
endif
else
+ ${INSTALL_DATA} src/emacs.pdmp "$(DESTDIR)${libexecdir}/Emacs.pdmp"
subdir=${ns_appresdir}/site-lisp && ${write_subdir}
rm -rf ${ns_appresdir}/share
endif
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 5e3465315af..89318a1efa8 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -71,11 +71,11 @@ ${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file}
../src/emacs${EXEEXT}
${MKDIR_P} ${ns_appbindir}
cp -f ../src/emacs${EXEEXT} $@
-# FIXME: Don't install the dump file into the app bundle when
-# self-contained install is disabled.
${ns_applibexecdir}/Emacs.pdmp: ${ns_appdir} ${ns_check_file}
../src/emacs${EXEEXT}.pdmp
${MKDIR_P} ${ns_applibexecdir}
+ifeq (${ns_self_contained},no)
cp -f ../src/emacs${EXEEXT}.pdmp $@
+endif
.PHONY: FORCE
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master d0b1e3647fb: macOS: only cp emacs.pdmp when installing (bug#66022),
Gerd Moellmann <=