]> git.eshelyaron.com Git - emacs.git/commitdiff
* Makefile.in (BIN_DESTDIR, src): Fix 'BIN_DESTDIR' on MacOS.
authorAndrea Corallo <akrl@sdf.org>
Wed, 7 Apr 2021 07:50:02 +0000 (09:50 +0200)
committerAndrea Corallo <akrl@sdf.org>
Wed, 7 Apr 2021 07:50:02 +0000 (09:50 +0200)
Makefile.in

index aa32ec8bc5e8318056213c13e8cbfae1ae12619a..e318db746d6496c01c33f956a875827c0088c138 100644 (file)
@@ -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