[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 8769d0f: * Makefile.in (install-arch-dep): Simplify
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 8769d0f: * Makefile.in (install-arch-dep): Simplify with Make conditionals. |
Date: |
Tue, 23 Jun 2015 20:44:17 +0000 |
branch: master
commit 8769d0fe79dda776652c3bf342263568bbd7623b
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* Makefile.in (install-arch-dep): Simplify with Make conditionals.
---
Makefile.in | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 63e17c3..c998d8d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -492,18 +492,17 @@ write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \
install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
$(MAKE) -C lib-src install
- if test "${ns_self_contained}" = "no"; then \
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT}
"$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
- chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \
- if test "x${NO_BIN_LINK}" = x; then \
- rm -f "$(DESTDIR)${bindir}/$(EMACS)" ; \
- cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS);
\
- fi; \
- else \
- subdir=${ns_appresdir}/site-lisp; \
- ${write_subdir} || exit 1; \
- rm -rf ${ns_appresdir}/share; \
- fi
+ifeq (${ns_self_contained},no)
+ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT}
"$(DESTDIR)${bindir}/$(EMACSFULL)"
+ -chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)"
+ifndef NO_BIN_LINK
+ rm -f "$(DESTDIR)${bindir}/$(EMACS)"
+ cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS)
+endif
+else
+ subdir=${ns_appresdir}/site-lisp && ${write_subdir}
+ rm -rf ${ns_appresdir}/share
+endif
### Windows-specific install target for installing programs produced
### in nt/, and its Posix do-nothing shadow.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 8769d0f: * Makefile.in (install-arch-dep): Simplify with Make conditionals.,
Glenn Morris <=