exporters for pkg-config: align with the changes for CMake

The latest CMake exporter changes reworked the the variables in builddata.pm
and installdata.pm.  Unfortunately, the pkg-config exporter templates were
forgotten in that effort.

Fixes #25299

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25308)

(cherry picked from commit 15b748496faeebb3b6d8021049bccc93903ee322)

diff --git a/exporters/pkg-config/libcrypto.pc.in b/exporters/pkg-config/libcrypto.pc.in
index f225bd6d22b17eeafad23dfbe76dea3604a498b0..3d56e9741831ab0dde49ddee4a871a72343f2060 100644 (file)
--- 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 80c91ec034e5c91faa9176cb56e7bfe4609a78c4..162db65c99a2afe3978412b5fb34a9f1343d7a69 100644 (file)
--- 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 225bef9e2384dadcb4c1c3be83b75d8f17ffc814..73eb8e73c2d27d62c08e9cc1eda2d00fb2c8e1fa 100644 (file)
--- 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