From: Glenn Morris <rgm@gnu.org>
Date: Thu, 17 May 2012 19:30:42 +0000 (-0400)
Subject: * Makefile.in (install-etc): Fix previous change.
X-Git-Tag: emacs-24.2.90~471^2~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=904769baa934f6d2febd59195633ce6bc12710ff;p=emacs.git

* 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.
---

diff --git a/Makefile.in b/Makefile.in
index 0649d2fee45..d2a8db90854 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -641,13 +641,16 @@ install-etc:
 	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