summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2006-11-25 22:27:33 -0800
committerJosh Triplett <josh@freedesktop.org>2006-11-25 23:56:38 -0800
commita27bafa29ab3ac137a908a66ed97a2bb3b7100e7 (patch)
tree1e9deb43d0e009cfa50d6abfcf7d725e24f052f1
parent978e8839cbd822f80c3236fa30d080574ff43b8d (diff)
Use substitition variables in xcb-xinerama.pc.in, not instances of their values
xcb-xinerama.pc.in looked more like a generated .pc file; replace specific instances of values provided by an invocation of configure with the general substitution variables configure replaces. (cherry picked from commit 98e2a5617ef1c9955b3b5553224c34f55c7c5d29)
-rw-r--r--debian/changelog2
-rw-r--r--xcb-xinerama.pc.in10
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 43a2e59..9a12664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libxcb (1.0-1) experimental; urgency=low
* Add XS-Vcs-Git field.
* Cherry-pick post-1.0 changes from master:
* "NetBSD doesn't have AI_ADDRCONFIG: use it only if it's available."
+ * "Use substitition variables in xcb-xinerama.pc.in, not instances of their
+ values"
-- Josh Triplett <josh@freedesktop.org> Fri, 24 Nov 2006 00:51:41 -0800
diff --git a/xcb-xinerama.pc.in b/xcb-xinerama.pc.in
index 93c35a3..c4775f9 100644
--- a/xcb-xinerama.pc.in
+++ b/xcb-xinerama.pc.in
@@ -1,11 +1,11 @@
-prefix=/opt/fdo/
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: XCB Xinerama
Description: XCB Xinerama Extension
-Version: 0.9.92
+Version: @PACKAGE_VERSION@
Requires: xcb
Libs: -L${libdir} -lxcb-xinerama
Cflags: -I${includedir}