From 3e48466e0a4d372ffeb595e4f64144a1b88bc79e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 6 Feb 2017 13:46:00 +1100 Subject: [PATCH] 4571. [bug] Out-of-tree builds of backtrace_test failed. --- CHANGES | 2 ++ bin/tests/Makefile.in | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index e827e9f433..990b245270 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +4571. [bug] Out-of-tree builds of backtrace_test failed. + 4570. [cleanup] named did not correctly fall back to the built-in initializing keys if the bind.keys file was present but empty. [RT #44531] diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index 8f487e248d..52164d6322 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -134,11 +134,11 @@ adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ adb_test.@O@ \ ${DNSLIBS} ${ISCLIBS} ${LIBS} -backtrace_test_nosymtbl@EXEEXT@: backtrace_test.c ${ISCDEPLIBS} +backtrace_test_nosymtbl@EXEEXT@: ${srcdir}/backtrace_test.c ${ISCDEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} -o $@ \ - backtrace_test.c ${ISCLIBS} ${LIBS} + ${srcdir}/backtrace_test.c ${ISCLIBS} ${LIBS} -backtrace_test@EXEEXT@: backtrace_test_nosymtbl@EXEEXT@ +backtrace_test@EXEEXT@: ${srcdir}/backtrace_test.c backtrace_test_nosymtbl@EXEEXT@ #first step: create a first symbol table rm -f symtbl.c if test X${MKSYMTBL_PROGRAM} != X; then \ @@ -147,7 +147,7 @@ backtrace_test@EXEEXT@: backtrace_test_nosymtbl@EXEEXT@ cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi #second step: build a binary with the first symbol table ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \ - -o $@0 backtrace_test.c symtbl.c \ + -o $@0 ${srcdir}/backtrace_test.c symtbl.c \ ${ISCNOSYMLIBS} ${LIBS} rm -f symtbl.c #third step: create a second symbol table @@ -157,7 +157,7 @@ backtrace_test@EXEEXT@: backtrace_test_nosymtbl@EXEEXT@ #fourth step: build the final binary rm -f $@0 ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \ - -o $@ backtrace_test.c symtbl.c ${ISCNOSYMLIBS} ${LIBS} + -o $@ ${srcdir}/backtrace_test.c symtbl.c ${ISCNOSYMLIBS} ${LIBS} rm -f symtbl.c nsecify@EXEEXT@: nsecify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}