diff options
| author | Po Lu <luangruo@yahoo.com> | 2021-11-30 08:16:50 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2021-11-30 08:16:50 +0800 |
| commit | 8f5d2a3181d22f858ede3fb6a1452f99272901fe (patch) | |
| tree | 1921a09e17c7c29d2637b073cf7b2158c71c6017 /Makefile.in | |
| parent | 901938109f7b5574e97e787bee10441086680de8 (diff) | |
| parent | d8dd705e9d82df96d67d88e1bf90373b6b4fbaa9 (diff) | |
| download | emacs-8f5d2a3181d22f858ede3fb6a1452f99272901fe.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 488b859285d..59b255b9267 100644 --- a/Makefile.in +++ b/Makefile.in @@ -102,6 +102,8 @@ HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@ USE_STARTUP_NOTIFICATION = @USE_STARTUP_NOTIFICATION@ +HAVE_BE_APP = @HAVE_BE_APP@ + # ==================== Where To Install Things ==================== # Location to install Emacs.app under GNUstep / macOS. @@ -528,7 +530,13 @@ install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR) $(MAKE) -C lib-src install ifeq (${ns_self_contained},no) ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" +ifeq (${HAVE_BE_APP},yes) + ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/Emacs "$(DESTDIR)${prefix}/apps/Emacs" +endif ifeq (${DUMPING},pdumper) +ifeq (${HAVE_BE_APP},yes) + ${INSTALL_DATA} src/Emacs.pdmp "$(DESTDIR)${libexecdir}/emacs/${version}/${configuration}"/Emacs.pdmp +endif ${INSTALL_DATA} src/emacs.pdmp "$(DESTDIR)${libexecdir}/emacs/${version}/${configuration}"/emacs-${EMACS_PDMP} endif -chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)" @@ -1144,14 +1152,23 @@ check-info: info .PHONY: bootstrap -# Bootstrapping does the following: +# Without a 'configure' variable, bootstrapping does the following: # * Remove files to start from a bootstrap-clean slate. # * Run autogen.sh. # * Rebuild Makefile, to update the build procedure itself. # * Do the actual build. -bootstrap: bootstrap-clean +# With a 'configure' variable, bootstrapping does the following: +# * Remove files to start from an extraclean slate. +# * Do the actual build, during which the 'configure' variable is +# used (see the Makefile goal in GNUmakefile). +bootstrap: +ifndef configure + $(MAKE) bootstrap-clean cd $(srcdir) && ./autogen.sh autoconf $(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile +else + $(MAKE) extraclean +endif $(MAKE) all .PHONY: ChangeLog change-history change-history-commit change-history-nocommit |