diff options
| author | Gerd Möllmann | 2023-09-21 07:06:50 +0200 |
|---|---|---|
| committer | Gerd Möllmann | 2023-09-21 07:09:53 +0200 |
| commit | d0b1e3647fb4e6d889f9f999388c53daf0e67f0d (patch) | |
| tree | eb3c0ca880031fe10f27e8468e78d1a61b0a882b | |
| parent | dad3afb7eb55932f7273a15895670e818fe144bd (diff) | |
| download | emacs-d0b1e3647fb4e6d889f9f999388c53daf0e67f0d.tar.gz emacs-d0b1e3647fb4e6d889f9f999388c53daf0e67f0d.zip | |
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.
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | 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 | |||
| 643 | cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)" | 643 | cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) "$(EMACSFULL)" "$(EMACS)" |
| 644 | endif | 644 | endif |
| 645 | else | 645 | else |
| 646 | ${INSTALL_DATA} src/emacs.pdmp "$(DESTDIR)${libexecdir}/Emacs.pdmp" | ||
| 646 | subdir=${ns_appresdir}/site-lisp && ${write_subdir} | 647 | subdir=${ns_appresdir}/site-lisp && ${write_subdir} |
| 647 | rm -rf ${ns_appresdir}/share | 648 | rm -rf ${ns_appresdir}/share |
| 648 | endif | 649 | 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} | |||
| 71 | ${MKDIR_P} ${ns_appbindir} | 71 | ${MKDIR_P} ${ns_appbindir} |
| 72 | cp -f ../src/emacs${EXEEXT} $@ | 72 | cp -f ../src/emacs${EXEEXT} $@ |
| 73 | 73 | ||
| 74 | # FIXME: Don't install the dump file into the app bundle when | ||
| 75 | # self-contained install is disabled. | ||
| 76 | ${ns_applibexecdir}/Emacs.pdmp: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT}.pdmp | 74 | ${ns_applibexecdir}/Emacs.pdmp: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT}.pdmp |
| 77 | ${MKDIR_P} ${ns_applibexecdir} | 75 | ${MKDIR_P} ${ns_applibexecdir} |
| 76 | ifeq (${ns_self_contained},no) | ||
| 78 | cp -f ../src/emacs${EXEEXT}.pdmp $@ | 77 | cp -f ../src/emacs${EXEEXT}.pdmp $@ |
| 78 | endif | ||
| 79 | 79 | ||
| 80 | .PHONY: FORCE | 80 | .PHONY: FORCE |
| 81 | 81 | ||