From af006ad50e088b8e2f715a1778fa4caa3ab28d8f Mon Sep 17 00:00:00 2001 From: Ulrich Mueller Date: Sat, 19 May 2012 11:57:10 -0700 Subject: [PATCH] * Makefile.in (install-etc): Respect DESTDIR. Fixes: debbugs:11518 --- ChangeLog | 4 ++++ Makefile.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e98201cc6..56326b34dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-19 Ulrich Mueller + + * Makefile.in (install-etc): Respect DESTDIR. (Bug#11518) + 2012-05-19 Paul Eggert * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols, diff --git a/Makefile.in b/Makefile.in index 74111dc834..6e0f8703d0 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 -- 2.20.1