Merge from emacs-24; up to 2012-12-12T22:29:54Z!yamaoka@jpl.org

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2916aeccd702addf37cc994a3f3002d59276796b..a2de4f3b164f6a023cd0f15c4b6b65dfa65382a6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -534,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 ; \
@@ -568,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}*.
@@ -632,6 +635,11 @@ install-man:
        done
 
 ## Install those items from etc/ that need to end up elsewhere.
+
+## If you prefer, choose "emacs22" at installation time.
+## Note: emacs22 does not have all the resolutions.
+EMACS_ICON=emacs
+
 install-etc:
        umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
        tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
@@ -646,10 +654,10 @@ install-etc:
        for dir in */*/apps */*/mimetypes; do \
          [ -d $${dir} ] || continue ; \
          ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
-         for icon in $${dir}/emacs[.-]*; do \
+         for icon in $${dir}/${EMACS_ICON}[.-]*; do \
            [ -r $${icon} ] || continue ; \
            ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \
-           dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e '$(TRANSFORM)'`.$${ext} ; \
+           dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e 's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'`.$${ext} ; \
            ( cd $${thisdir}; \
              ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \
            || exit 1; \