aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkinori MUSHA2012-12-19 23:56:56 -0800
committerGlenn Morris2012-12-19 23:56:56 -0800
commit018246572cf6cb10fd7f3283862a0d2913d0dc5f (patch)
tree191ca2ebd64cc468de7ba53a8aa0c75f4b0c84d8
parenta1d25d028bf073aeb7df48e845547300a5fd4e9e (diff)
downloademacs-018246572cf6cb10fd7f3283862a0d2913d0dc5f.tar.gz
emacs-018246572cf6cb10fd7f3283862a0d2913d0dc5f.zip
* Makefile.in (install-arch-dep): Ignore chmod errors (tiny change)
Fixes: debbugs:13233
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a8108968665..181fa811543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-12-20 Akinori MUSHA <knu@iDaemons.org> (tiny change)
2
3 * Makefile.in (install-arch-dep): Ignore chmod errors. (Bug#13233)
4
12012-12-13 Glenn Morris <rgm@gnu.org> 52012-12-13 Glenn Morris <rgm@gnu.org>
2 6
3 * info/dir: Add bovine, wisent. 7 * info/dir: Add bovine, wisent.
diff --git a/Makefile.in b/Makefile.in
index bec9b0eea14..657884c8498 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -445,7 +445,7 @@ install-arch-dep: src install-arch-indep install-doc
445 INSTALL_STRIP=${INSTALL_STRIP} 445 INSTALL_STRIP=${INSTALL_STRIP}
446 if test "${ns_self_contained}" = "no"; then \ 446 if test "${ns_self_contained}" = "no"; then \
447 ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ 447 ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
448 chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \ 448 chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
449 if test "x${NO_BIN_LINK}" = x; then \ 449 if test "x${NO_BIN_LINK}" = x; then \
450 rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ 450 rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
451 cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \ 451 cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \