diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-10 02:18:38 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-10 05:09:39 +0100 |
| commit | e8461ee1d17d64dddcdedf133c7f47ab4ac15ff2 (patch) | |
| tree | 2047744343068b6cac57cb21b0cecd26bad94578 /engines/build.info | |
| parent | Make the processing of build.info files more aware of absolute dirs (diff) | |
| download | openssl-e8461ee1d17d64dddcdedf133c7f47ab4ac15ff2.tar.xz openssl-e8461ee1d17d64dddcdedf133c7f47ab4ac15ff2.zip | |
Simplify the specification of include dirs in the build dir
In build.info files, make the include directory in the build directory
absolute, or Configure will think it should be added to the source
directory top. Configure will turn it into a relative path if
possible.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'engines/build.info')
| -rw-r--r-- | engines/build.info | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/build.info b/engines/build.info index 88c5bf7736..0c8e04b052 100644 --- a/engines/build.info +++ b/engines/build.info @@ -1,4 +1,4 @@ -{- use File::Spec::Functions qw/:DEFAULT abs2rel/; -} +{- use File::Spec::Functions qw/:DEFAULT rel2abs/; -} IF[{- $config{no_shared} -}] LIBS=../libcrypto SOURCE[../libcrypto]=\ @@ -9,14 +9,14 @@ ELSE ENGINES=libpadlock libcapi libdasync libossltest SOURCE[libpadlock]=e_padlock.c {- $target{padlock_asm_src} -} DEPEND[libpadlock]=../libcrypto - INCLUDE[libpadlock]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include + INCLUDE[libpadlock]={- rel2abs(catdir($builddir,"../include")) -} ../include SOURCE[libcapi]=e_capi.c DEPEND[libcapi]=../libcrypto - INCLUDE[libcapi]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include + INCLUDE[libcapi]={- rel2abs(catdir($builddir,"../include")) -} ../include SOURCE[libdasync]=e_dasync.c DEPEND[libdasync]=../libcrypto - INCLUDE[libdasync]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include + INCLUDE[libdasync]={- rel2abs(catdir($builddir,"../include")) -} ../include SOURCE[libossltest]=e_ossltest.c DEPEND[libossltest]=../libcrypto - INCLUDE[libossltest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include + INCLUDE[libossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include ENDIF |