Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 89c06cc..122a35d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -246,6 +246,7 @@ INSTALL_INFO = @INSTALL_INFO@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
 MKDIR_P = @MKDIR_P@
+LN_S = @LN_S@
 
 # We use gzip to compress installed .el files.
 GZIP_PROG = @GZIP_PROG@
@@ -436,8 +437,10 @@ install-arch-dep: install-arch-indep install-doc
        if test "${ns_self_contained}" = "no"; then \
          ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
          chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \
-         rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
-         ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \
+         if test "x${NO_BIN_LINK}" = x; then \
+           rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
+           cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
+         fi; \
        else \
          subdir=${ns_appresdir}/site-lisp; \
          ${write_subdir} || exit 1; \
@@ -495,8 +498,11 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
 ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
 install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
        umask 022 ; \
-         eval $(MKDIR_P) \
-           "'$(DESTDIR)`echo ${locallisppath}|sed \"s,:,' '$(DESTDIR),g\"`'"
+       locallisppath='${locallisppath}'; \
+       IFS=:; \
+       for d in $$locallisppath; do \
+         ${MKDIR_P} "$(DESTDIR)$$d"; \
+       done
        -set ${COPYDESTS} ; \
        unset CDPATH; \
        $(set_installuser); \