]> git.eshelyaron.com Git - emacs.git/commitdiff
macOS: only cp emacs.pdmp when installing (bug#66022)
authorGerd Möllmann <gerd@gnu.org>
Thu, 21 Sep 2023 05:06:50 +0000 (07:06 +0200)
committerGerd Möllmann <gerd@gnu.org>
Thu, 21 Sep 2023 05:09:53 +0000 (07:09 +0200)
* 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
nextstep/Makefile.in

index c82aad1af605500a96074acff054414d38638e61..51a27cc1814b44ddd6fb844771270951945fcd44 100644 (file)
@@ -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
index 5e3465315af7ccad47651540790ce595c7312756..89318a1efa8e6e116a4d00c6a423f310e584c17f 100644 (file)
@@ -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