Module Name: src
Committed By: njoly
Date: Tue Jan 17 19:40:08 UTC 2012
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
For xkb_base, do not use ${libdir} (xkeyboard-config.pc does not define
it) but its value ${prefix}/lib instead.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.104 src/share/mk/bsd.x11.mk:1.105
--- src/share/mk/bsd.x11.mk:1.104 Thu Sep 29 10:59:26 2011
+++ src/share/mk/bsd.x11.mk Tue Jan 17 19:40:08 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.104 2011/09/29 10:59:26 dholland Exp $
+# $NetBSD: bsd.x11.mk,v 1.105 2012/01/17 19:40:08 njoly Exp $
.include <bsd.init.mk>
@@ -285,7 +285,7 @@ pkgconfig-install: ${_PKGDEST.${_pkg}}
s,@Z_LIBS@,-lz,; \
s,@LIBZ@,-lz,; \
s,@LIBBZ2@,-lbz2,; \
- s,@xkb_base@,\\$$\{libdir\}/X11/xkb,; \
+ s,@xkb_base@,\\$$\{prefix\}/lib/X11/xkb,; \
s,@xcbincludedir@,\\$$\{prefix\}/share/xcb,; \
s,@fontrootdir@,\\$$\{libdir\}/X11/fonts,; \
s,@LIBXML2_LIBS@,,; \
