On 07/11/2017 05:16, Peter Hutterer wrote:
On Mon, Nov 06, 2017 at 12:55:20PM -0500, Adam Jackson wrote:
Signed-off-by: Adam Jackson <[email protected]>
---
  xkbcomp.pc.in | 1 +
  1 file changed, 1 insertion(+)

diff --git a/xkbcomp.pc.in b/xkbcomp.pc.in
index b8d6023..4d138c8 100644
--- a/xkbcomp.pc.in
+++ b/xkbcomp.pc.in
@@ -1,4 +1,5 @@
  prefix=@prefix@
+bindir=@bindir@
  datarootdir=@datarootdir@
  datadir=@datadir@
  xkbconfigdir=@XKBCONFIGROOT@
--
2.14.3
for some reason this doesn't work here. It gets replaced with:
bindir=${exec_prefix}/bin

but exec_prefix isn't set. With a --prefix=/opt/xorg, I still get:
$> pkg-config --variable bindir xkbcomp
/bin

Adding this fixed it:

diff --git a/xkbcomp.pc.in b/xkbcomp.pc.in
index 4d138c8..a4791a9 100644
--- a/xkbcomp.pc.in
+++ b/xkbcomp.pc.in
@@ -1,4 +1,5 @@
  prefix=@prefix@
+exec_prefix=@exec_prefix@
  bindir=@bindir@
  datarootdir=@datarootdir@
  datadir=@datadir@


Yes, I found this necessary also, and I think it's correct, as bindir may be expressed in terms of exec_prefix.

Reviewed-by: Jon Turney <[email protected]>
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to