From: Andrea Corallo Date: Wed, 7 Apr 2021 07:50:02 +0000 (+0200) Subject: * Makefile.in (BIN_DESTDIR, src): Fix 'BIN_DESTDIR' on MacOS. X-Git-Tag: emacs-28.0.90~2727^2~30 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce15b23846cd82acccb6ce5dd13b0a42f487296b;p=emacs.git * Makefile.in (BIN_DESTDIR, src): Fix 'BIN_DESTDIR' on MacOS. --- diff --git a/Makefile.in b/Makefile.in index aa32ec8bc5e..e318db746d6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -321,6 +321,11 @@ CONFIG_STATUS_FILES_IN = \ COPYDIR = ${srcdir}/etc ${srcdir}/lisp COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" +ifeq (${ns_self_contained},no) +BIN_DESTDIR='$(DESTDIR)${bindir}/' +else +BIN_DESTDIR='${ns_appbindir}/' +endif ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/ all: ${SUBDIR} info @@ -416,7 +421,7 @@ lib lib-src lisp nt: Makefile dirstate = .git/logs/HEAD VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate)) src: Makefile - $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' BIN_DESTDIR='$(DESTDIR)${bindir}/' \ + $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' BIN_DESTDIR='$(BIN_DESTDIR)' \ ELN_DESTDIR='$(ELN_DESTDIR)' all blessmail: Makefile src