* doc/misc/org.texi: Fix previous change.

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d7eec829495090d92214978d9149c1546ef62820..9f1e9707d1d6c5b39f2daff17a67d387ac94f391 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 # DIST: make most of the changes to this file you might want, so try
 # DIST: that first.
 
-# Copyright (C) 1992-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -259,8 +259,9 @@ GZIP_INFO = @GZIP_INFO@
 TRANSFORM = @program_transform_name@
 
 # What emacs should be called when installed.
-EMACS = `echo emacs${EXEEXT} | sed '$(TRANSFORM)'`
-EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
+EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'`
+EMACS = ${EMACS_NAME}${EXEEXT}
+EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
 
 # Subdirectories to make recursively.
 SUBDIR = lib lib-src src lisp leim
@@ -444,7 +445,7 @@ install-arch-dep: src install-arch-indep install-doc
            INSTALL_STRIP=${INSTALL_STRIP}
        if test "${ns_self_contained}" = "no"; then \
          ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
-         chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \
+         chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
          if test "x${NO_BIN_LINK}" = x; then \
            rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
            cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
@@ -533,6 +534,7 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
               tar -xvf - && cat > /dev/null) || exit 1; \
          [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
          for subdir in `find $${dest} -type d -print` ; do \
+           chmod a+rx $${subdir} ; \
            rm -f $${subdir}/.gitignore ; \
            rm -f $${subdir}/.arch-inventory ; \
            rm -f $${subdir}/.DS_Store ; \
@@ -567,7 +569,9 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
            done )
        -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
 
-# The last chmod isn't needed at present.
+## The above chmods are needed because "umask 022; tar ..." is not
+## guaranteed to do the right thing; eg if we are root and tar is
+## preserving source permissions.
 
 ## We install only the relevant DOC file if possible
 ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.
@@ -602,7 +606,7 @@ install-info: info
           [ -f dir ] || \
             (cd $${thisdir}; \
              ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
-          info_misc=`cd $${thisdir}/doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \
+          info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \
           cd ${srcdir}/info ; \
           for elt in ${INFO_NONMISC} $${info_misc}; do \
              test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -633,12 +637,12 @@ install-man:
 ## Install those items from etc/ that need to end up elsewhere.
 install-etc:
        umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
-       dest=`echo emacs | sed '$(TRANSFORM)'`; \
        tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
-       sed -e "/^Exec=emacs/ s/emacs/$${dest}/" \
-         -e "/^Icon=emacs/ s/emacs/$${dest}/" \
+       emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \
+       sed -e "/^Exec=emacs/ s/emacs/$${emacs_name}/" \
+         -e "/^Icon=emacs/ s/emacs/$${emacs_name}/" \
          ${srcdir}/etc/emacs.desktop > $${tmp}; \
-       ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/$${dest}.desktop; \
+       ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop; \
        rm -f $${tmp}
        thisdir=`/bin/pwd`; \
        cd ${iconsrcdir} || exit 1; umask 022 ; \
@@ -684,7 +688,7 @@ uninstall:
        done
        -rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
        thisdir=`/bin/pwd`; \
-       (info_misc=`cd doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \
+       (info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \
         if cd $(DESTDIR)${infodir}; then \
           for elt in ${INFO_NONMISC} $${info_misc}; do \
             (cd $${thisdir}; \
@@ -702,11 +706,11 @@ uninstall:
         fi)
        (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS) || true)
        (if cd $(DESTDIR)${icondir}; then \
-          rm -f hicolor/*x*/apps/`echo emacs | sed '$(TRANSFORM)'`.png \
-            hicolor/scalable/apps/`echo emacs | sed '$(TRANSFORM)'`.svg \
+          rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
+            hicolor/scalable/apps/${EMACS_NAME}.svg \
             hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \
        fi)
-       -rm -f $(DESTDIR)${desktopdir}/`echo emacs | sed '$(TRANSFORM)'`.desktop
+       -rm -f $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop
        for file in snake-scores tetris-scores; do \
          file=$(DESTDIR)${gamedir}/$${file}; \
          [ -s $${file} ] || rm -f $$file; \