diff --git a/exporters/pkg-config/libcrypto.pc.in b/exporters/pkg-config/libcrypto.pc.in index f225bd6d22..3d56e97418 100644 --- a/exporters/pkg-config/libcrypto.pc.in +++ b/exporters/pkg-config/libcrypto.pc.in @@ -1,8 +1,13 @@ prefix={- $OpenSSL::safe::installdata::PREFIX[0] -} exec_prefix=${prefix} -libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0] - ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0] - : $OpenSSL::safe::installdata::libdir[0] -} +libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) { + my $x = ''; + $x = '/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0] + if $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]; + '${exec_prefix}' . $x; + } else { + $OpenSSL::safe::installdata::libdir[0]; + } -} includedir={- $OUT = ''; $OUT .= '${prefix}/' . $_ . ' ' foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -} diff --git a/exporters/pkg-config/libssl.pc.in b/exporters/pkg-config/libssl.pc.in index 80c91ec034..162db65c99 100644 --- a/exporters/pkg-config/libssl.pc.in +++ b/exporters/pkg-config/libssl.pc.in @@ -1,8 +1,13 @@ -prefix={- $OpenSSL::safe::installdata::PREFIX -} +prefix={- $OpenSSL::safe::installdata::PREFIX[0] -} exec_prefix=${prefix} -libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX - ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX - : $OpenSSL::safe::installdata::libdir -} +libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) { + my $x = ''; + $x = '/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0] + if $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]; + '${exec_prefix}' . $x; + } else { + $OpenSSL::safe::installdata::libdir[0]; + } -} includedir={- $OUT = ''; $OUT .= '${prefix}/' . $_ . ' ' foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -} diff --git a/exporters/pkg-config/openssl.pc.in b/exporters/pkg-config/openssl.pc.in index 225bef9e23..73eb8e73c2 100644 --- a/exporters/pkg-config/openssl.pc.in +++ b/exporters/pkg-config/openssl.pc.in @@ -1,9 +1,16 @@ -prefix={- $OpenSSL::safe::installdata::PREFIX -} +prefix={- $OpenSSL::safe::installdata::PREFIX[0] -} exec_prefix=${prefix} -libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX - ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX - : $OpenSSL::safe::installdata::libdir -} -includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -} +libdir={- if (defined $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]) { + my $x = ''; + $x = '/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0] + if $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0]; + '${exec_prefix}' . $x; + } else { + $OpenSSL::safe::installdata::libdir[0]; + } -} +includedir={- $OUT = ''; + $OUT .= '${prefix}/' . $_ . ' ' + foreach (@OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX); -} Name: OpenSSL Description: Secure Sockets Layer and cryptography libraries and tools