[src/trunk]: src/share/mk For xkb_base, do not use ${libdir} (xkeyboard-confi...

[njoly <njoly%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4d7149dbd40a
branches:  trunk
changeset: 772839:4d7149dbd40a
user:      njoly <njoly%NetBSD.org@localhost>
date:      Tue Jan 17 19:40:08 2012 +0000

description:
For xkb_base, do not use ${libdir} (xkeyboard-config.pc does not define
it) but its value ${prefix}/lib instead.

diffstat:

 share/mk/bsd.x11.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 192eac1f6e57 -r 4d7149dbd40a share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Tue Jan 17 19:13:22 2012 +0000
+++ b/share/mk/bsd.x11.mk       Tue Jan 17 19:40:08 2012 +0000
@@ -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 @@
                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@,,; \