All of lore.kernel.org
 help / color / mirror / Atom feed
From: "W. Michael Petullo" <mike@flyn.org>
To: selinux@vger.kernel.org
Subject: [PATCH] selinux: make use of variables when defining libdir and  includedir
Date: Thu, 16 Jul 2020 15:32:26 -0500	[thread overview]
Message-ID: <8ebd6f4ab80e8b73ce3b4ff4e146c39b2123cec3.camel@flyn.org> (raw)

Pkg-config definitions commonly make use of ${exec_prefix} and
${prefix} when defining libdir and includedir, respectively. OpenWrt,
for example, relies on this when it adjusts things for cross
compiling.

Signed-off-by: W. Michael Petullo <mike@flyn.org>
---
 libselinux/src/libselinux.pc.in | 4 ++--
 libsepol/src/libsepol.pc.in     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libselinux/src/libselinux.pc.in
b/libselinux/src/libselinux.pc.in
index 7c66b1fa..d9d58125 100644
--- a/libselinux/src/libselinux.pc.in
+++ b/libselinux/src/libselinux.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=@libdir@
-includedir=@includedir@
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include

 Name: libselinux
 Description: SELinux utility library
diff --git a/libsepol/src/libsepol.pc.in b/libsepol/src/libsepol.pc.in
index f807fec6..cf2411e4 100644
--- a/libsepol/src/libsepol.pc.in
+++ b/libsepol/src/libsepol.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=@libdir@
-includedir=@includedir@
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include

 Name: libsepol
 Description: SELinux policy library
-- 
2.26.2



             reply	other threads:[~2020-07-16 20:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-16 20:32 W. Michael Petullo [this message]
2020-07-19 17:15 ` [PATCH] selinux: make use of variables when defining libdir and includedir Nicolas Iooss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8ebd6f4ab80e8b73ce3b4ff4e146c39b2123cec3.camel@flyn.org \
    --to=mike@flyn.org \
    --cc=selinux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.