From 642e4ac70ddc4e7037a515208b30d5cf8d8efc94 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Mon, 16 Mar 2015 14:07:23 +0530 Subject: [PATCH] Fix out-of-srcdir build with native pkcs11 (#38831) --- CHANGES | 2 ++ bin/pkcs11/Makefile.in | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 81cab6ad04..b458bced4f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +4086. [bug] Fix out-of-srcdir build with native pkcs11. [RT #38831] + 4085. [bug] ISC_PLATFORM_HAVEXADDQ could be inconsistently set. [RT #38828] diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in index dac3832da0..191d0ec946 100644 --- a/bin/pkcs11/Makefile.in +++ b/bin/pkcs11/Makefile.in @@ -51,21 +51,21 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES} @BIND9_MAKE_RULES@ -pkcs11-list@EXEEXT@: @srcdir@/pkcs11-list.@O@ ${DEPLIBS} +pkcs11-list@EXEEXT@: pkcs11-list.@O@ ${DEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \ - -o $@ @srcdir@/pkcs11-list.@O@ ${LIBS} + -o $@ pkcs11-list.@O@ ${LIBS} -pkcs11-destroy@EXEEXT@: @srcdir@/pkcs11-destroy.@O@ ${DEPLIBS} +pkcs11-destroy@EXEEXT@: pkcs11-destroy.@O@ ${DEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \ - -o $@ @srcdir@/pkcs11-destroy.@O@ ${LIBS} + -o $@ pkcs11-destroy.@O@ ${LIBS} -pkcs11-keygen@EXEEXT@: @srcdir@/pkcs11-keygen.@O@ ${DEPLIBS} +pkcs11-keygen@EXEEXT@: pkcs11-keygen.@O@ ${DEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \ - -o $@ @srcdir@/pkcs11-keygen.@O@ ${LIBS} + -o $@ pkcs11-keygen.@O@ ${LIBS} -pkcs11-tokens@EXEEXT@: @srcdir@/pkcs11-tokens.@O@ ${DEPLIBS} +pkcs11-tokens@EXEEXT@: pkcs11-tokens.@O@ ${DEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} \ - -o $@ @srcdir@/pkcs11-tokens.@O@ ${LIBS} + -o $@ pkcs11-tokens.@O@ ${LIBS} doc man:: ${MANOBJS}