[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp ce15b23: * Makefile.in (BIN_DESTDIR, src): Fix 'BIN_
From: |
Andrea Corallo |
Subject: |
feature/native-comp ce15b23: * Makefile.in (BIN_DESTDIR, src): Fix 'BIN_DESTDIR' on MacOS. |
Date: |
Wed, 7 Apr 2021 03:51:38 -0400 (EDT) |
branch: feature/native-comp
commit ce15b23846cd82acccb6ce5dd13b0a42f487296b
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
* Makefile.in (BIN_DESTDIR, src): Fix 'BIN_DESTDIR' on MacOS.
---
Makefile.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index aa32ec8..e318db7 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/native-comp ce15b23: * Makefile.in (BIN_DESTDIR, src): Fix 'BIN_DESTDIR' on MacOS.,
Andrea Corallo <=