From: Ulrich Mueller <ulm@gentoo.org>
Date: Sat, 19 May 2012 18:57:10 +0000 (-0700)
Subject: * Makefile.in (install-etc): Respect DESTDIR.
X-Git-Tag: emacs-24.2.90~471^2~6^2~110^2~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af006ad50e088b8e2f715a1778fa4caa3ab28d8f;p=emacs.git

* Makefile.in (install-etc): Respect DESTDIR.

Fixes: debbugs:11518
---

diff --git a/ChangeLog b/ChangeLog
index 7e98201cc61..56326b34ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-19  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Makefile.in (install-etc): Respect DESTDIR.  (Bug#11518)
+
 2012-05-19  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols,
diff --git a/Makefile.in b/Makefile.in
index 74111dc8348..6e0f8703d06 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -630,11 +630,11 @@ install-etc:
 	cd ${iconsrcdir} || exit 1; umask 022 ; \
 	for dir in */*/apps */*/mimetypes; do \
 	  [ -d $${dir} ] || continue ; \
-	  ( cd $${thisdir}; ${MKDIR_P} ${icondir}/$${dir} ) ; \
+	  ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
 	  for icon in $${dir}/*.*; do \
 	    [ -r $${icon} ] || continue ; \
 	    ( cd $${thisdir}; \
-	      ${INSTALL_DATA} ${iconsrcdir}/$${icon} ${icondir}/$${icon} ) \
+	      ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \
 	    || exit 1; \
 	  done ; \
 	done