aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Mueller2012-05-19 11:57:10 -0700
committerGlenn Morris2012-05-19 11:57:10 -0700
commitaf006ad50e088b8e2f715a1778fa4caa3ab28d8f (patch)
treea70fe3362646fb7b7b75599565a674685c0aa00a
parentafdc34774001166f25e998ba925301338001c3cc (diff)
downloademacs-af006ad50e088b8e2f715a1778fa4caa3ab28d8f.tar.gz
emacs-af006ad50e088b8e2f715a1778fa4caa3ab28d8f.zip
* Makefile.in (install-etc): Respect DESTDIR.
Fixes: debbugs:11518
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e98201cc61..56326b34ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-05-19 Ulrich Mueller <ulm@gentoo.org>
2
3 * Makefile.in (install-etc): Respect DESTDIR. (Bug#11518)
4
12012-05-19 Paul Eggert <eggert@cs.ucla.edu> 52012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols, 7 * 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:
630 cd ${iconsrcdir} || exit 1; umask 022 ; \ 630 cd ${iconsrcdir} || exit 1; umask 022 ; \
631 for dir in */*/apps */*/mimetypes; do \ 631 for dir in */*/apps */*/mimetypes; do \
632 [ -d $${dir} ] || continue ; \ 632 [ -d $${dir} ] || continue ; \
633 ( cd $${thisdir}; ${MKDIR_P} ${icondir}/$${dir} ) ; \ 633 ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
634 for icon in $${dir}/*.*; do \ 634 for icon in $${dir}/*.*; do \
635 [ -r $${icon} ] || continue ; \ 635 [ -r $${icon} ] || continue ; \
636 ( cd $${thisdir}; \ 636 ( cd $${thisdir}; \
637 ${INSTALL_DATA} ${iconsrcdir}/$${icon} ${icondir}/$${icon} ) \ 637 ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \
638 || exit 1; \ 638 || exit 1; \
639 done ; \ 639 done ; \
640 done 640 done