[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5caef3b5028599958bfddbdb86ea4f47df9f315b (commit)
      from  d94c444bcdc12f63ed122fa7ad0d1b71fa319ce7 (commit)


- Log -----------------------------------------------------------------
commit 5caef3b5028599958bfddbdb86ea4f47df9f315b
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 11 12:28:26 2016 +0100

    Add inclusion directory crypto/include for BN compilations
    
    Some files in crypto/bn depend on internal/bn_conf.h, and so does
    test/bntest.  Therefore, we add another inclusion directory.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/build.info | 2 ++
 test/build.info      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index 66f62dc..bb410f2 100644
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -1,3 +1,4 @@
+{- use File::Spec::Functions qw/catdir rel2abs/; -}
 LIBS=../../libcrypto
 SOURCE[../../libcrypto]=\
         bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
@@ -6,6 +7,7 @@ SOURCE[../../libcrypto]=\
         {- $target{bn_asm_src} -} \
         bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \
         bn_depr.c bn_const.c bn_x931p.c bn_intern.c bn_dh.c bn_srp.c
+INCLUDE[../../libcrypto]={- rel2abs(catdir($builddir,"..","..","crypto","include")) -}
 
 BEGINRAW[Makefile]
 ##### BN assembler implementations
diff --git a/test/build.info b/test/build.info
index bf9fead..a321692 100644
--- a/test/build.info
+++ b/test/build.info
@@ -20,7 +20,7 @@ INCLUDE[nptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
 DEPEND[nptest]=../libcrypto
 
 SOURCE[bntest]=bntest.c
-INCLUDE[bntest]={- rel2abs(catdir($builddir,"../include")) -} .. ../crypto/include ../include
+INCLUDE[bntest]={- rel2abs(catdir($builddir,"../crypto/include")) -} {- rel2abs(catdir($builddir,"../include")) -} .. ../crypto/include ../include
 DEPEND[bntest]=../libcrypto
 
 SOURCE[ectest]=ectest.c