Move where include path for providers/common/include gets specified
authorMatt Caswell <matt@openssl.org>
Fri, 19 Apr 2019 09:31:18 +0000 (10:31 +0100)
committerMatt Caswell <matt@openssl.org>
Thu, 23 May 2019 10:02:04 +0000 (11:02 +0100)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8728)

build.info
providers/build.info

index ce5dfd055d6bb0d8359ee1d6c8535bc4a867ea5e..a0ecb21881637a2c998a8cfbae4e244a36cbe379 100644 (file)
@@ -3,7 +3,7 @@
 SUBDIRS=crypto ssl apps test util tools fuzz engines providers
 
 LIBS=libcrypto libssl
 SUBDIRS=crypto ssl apps test util tools fuzz engines providers
 
 LIBS=libcrypto libssl
-INCLUDE[libcrypto]=. crypto/include include providers/common/include
+INCLUDE[libcrypto]=. crypto/include include
 INCLUDE[libssl]=. include
 DEPEND[libssl]=libcrypto
 
 INCLUDE[libssl]=. include
 DEPEND[libssl]=libcrypto
 
index ef107a7334f93cd39e4ca7dc27fced3b2ea3cc04..f379f740d5b834f6bb1d77cbcb435fa9dc17f0d6 100644 (file)
@@ -1,5 +1,7 @@
 SUBDIRS=common default
 
 SUBDIRS=common default
 
+INCLUDE[../libcrypto]=common/include
+
 IF[{- !$disabled{fips} -}]
   SUBDIRS=fips
   MODULES=fips
 IF[{- !$disabled{fips} -}]
   SUBDIRS=fips
   MODULES=fips