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

Fixes: debbugs:11518

diff --git a/ChangeLog b/ChangeLog
index 7e98201cc613981a7e1868c39eddeff1d45bc009..56326b34ddb28fb70e8f775da3e202af95f0175e 100644 (file)
--- 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 74111dc8348aa1cc4755884027eec09fd48a2703..6e0f8703d0666081156ebc44e1f6153962848905 100644 (file)
--- 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