[Emacs-diffs] /srv/bzr/emacs/trunk r108267: * Makefile.in (install-etc): Fix previous change.

[Glenn Morris]

------------------------------------------------------------
revno: 108267
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-17 15:30:42 -0400
message:
  * Makefile.in (install-etc): Fix previous change.
  
  Remember to always call MKDIR_P and INSTALL_DATA from the top-level
  directory, for the case in which we are falling back to build-aux/install-sh.
  It would make life much easier if autoconf would use an absolute path
  in this case.
modified:
  Makefile.in

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-17 19:13:02 +0000
+++ b/Makefile.in       2012-05-17 19:30:42 +0000
@@ -641,13 +641,16 @@
        umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
        ${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
          $(DESTDIR)${desktopdir}/emacs.desktop
+       thisdir=`/bin/pwd` ; \
        cd ${iconsrcdir} || exit 1; umask 022 ; \
        for dir in */*/apps */*/mimetypes; do \
          [ -d $${dir} ] || continue ; \
-         ${MKDIR_P} ${icondir}/$${dir} ; \
+         ( cd $${thisdir}; ${MKDIR_P} ${icondir}/$${dir} ) ; \
          for icon in $${dir}/*.*; do \
            [ -r $${icon} ] || continue ; \
-           ${INSTALL_DATA} $${icon} ${icondir}/$${icon} || exit 1 ; \
+           ( cd $${thisdir} ; \
+             ${INSTALL_DATA} ${iconsrcdir}/$${icon} ${icondir}/$${icon} ) \
+           || exit 1 ; \
          done ; \
        done