diff options
| author | Richard Levitte <levitte@openssl.org> | 2024-07-17 18:23:57 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-08-27 17:20:12 +0200 |
| commit | accd835f8d6ed946eb540a3e2e82f9723093f094 (patch) | |
| tree | 47c89eb38b47a1d8716d39d2659ce8443971033d /build.info | |
| parent | a82d9e572cc757e4fa50d484bfbb7115f2d027dd (diff) | |
fix: for exporters to work for build config, there may be two include dirs
For CMake / pkg-config configuration files to be used for an uninstalled
build, the include directory in the build directory isn't enough, if that
one is separate from the source directory. The include directory in the
source directory must be accounted for too.
This includes some lighter refactoring of util/mkinstallvars.pl, with the
result that almost all variables in builddata.pm and installdata.pm have
become arrays, even though unnecessarily for most of them; it was simpler
that way. The CMake / pkg-config templates are adapted accordingly.
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24918)
Diffstat (limited to 'build.info')
| -rw-r--r-- | build.info | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build.info b/build.info index ceb8b54aeb..22c7c8a94b 100644 --- a/build.info +++ b/build.info @@ -131,7 +131,8 @@ DEPEND[openssl.pc]=builddata.pm DEPEND[openssl.pc]=libcrypto.pc libssl.pc GENERATE[builddata.pm]=util/mkinstallvars.pl \ - PREFIX=. BINDIR=apps LIBDIR= INCLUDEDIR=include APPLINKDIR=ms \ + PREFIX=. BINDIR=apps APPLINKDIR=ms \ + LIBDIR= INCLUDEDIR=include "INCLUDEDIR=$(SRCDIR)/include" \ ENGINESDIR=engines MODULESDIR=providers \ "VERSION=$(VERSION)" "LDLIBS=$(LIB_EX_LIBS)" |