diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-04-07 09:50:02 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-04-07 09:50:02 +0200 |
| commit | ce15b23846cd82acccb6ce5dd13b0a42f487296b (patch) | |
| tree | 1c9246f2395f284f083a1c1d91f44e388b3ab939 /Makefile.in | |
| parent | 208ffc284c7f492151c1d2f76845cefea7a35341 (diff) | |
| download | emacs-ce15b23846cd82acccb6ce5dd13b0a42f487296b.tar.gz | |
* Makefile.in (BIN_DESTDIR, src): Fix 'BIN_DESTDIR' on MacOS.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 6 insertions, 1 deletions
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 |