From c08a03a43116c21cf12dea7cbcb5465588f7955c Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 16 Apr 2002 04:24:31 +0000 Subject: [PATCH] 1268. [bug] DESTDIR was not being propogated between makes. --- CHANGES | 2 ++ make/rules.in | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 818af62b02..318caae748 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +1268. [bug] DESTDIR was not being propogated between makes. + 1247. [bug] Don't reset the interface index for link/site local addresses. [RT #2576] diff --git a/make/rules.in b/make/rules.in index 2edf56115c..bc7655d089 100644 --- a/make/rules.in +++ b/make/rules.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: rules.in,v 1.42 2002/03/11 22:07:49 bwelling Exp $ +# $Id: rules.in,v 1.43 2002/04/16 04:24:31 marka Exp $ ### ### Common Makefile rules for BIND 9. @@ -66,7 +66,7 @@ subdirs: @for i in ${ALL_SUBDIRS}; do \ if [ "$$i" != "nulldir" -a -d $$i ]; then \ echo "making all in `pwd`/$$i"; \ - (cd $$i; ${MAKE} ${MAKEDEFS} all) || exit 1; \ + (cd $$i; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" all) || exit 1; \ fi; \ done @@ -76,7 +76,7 @@ install clean distclean maintainer-clean doc docclean man manclean:: @for i in ${ALL_SUBDIRS}; do \ if [ "$$i" != "nulldir" -a -d $$i ]; then \ echo "making $@ in `pwd`/$$i"; \ - (cd $$i; ${MAKE} ${MAKEDEFS} $@) || exit 1; \ + (cd $$i; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@) || exit 1; \ fi; \ done @@ -137,7 +137,7 @@ depend: @for i in ${ALL_SUBDIRS}; do \ if [ "$$i" != "nulldir" -a -d $$i ]; then \ echo "making depend in `pwd`/$$i"; \ - (cd $$i; ${MAKE} ${MAKEDEFS} $@) || exit 1; \ + (cd $$i; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@) || exit 1; \ fi; \ done @if [ X"${SRCS}" != X -a X"${PSRCS}" != X ] ; then \