[src/trunk]: src/external/mit/xorg Allow the build to work on a read-only sou...

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

details:   https://anonhg.NetBSD.org/src/rev/82c6b74085a5
branches:  trunk
changeset: 755027:82c6b74085a5
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 20 12:51:16 2010 +0000

description:
Allow the build to work on a read-only source tree. From Anon Ymous

diffstat:

 external/mit/xorg/bin/xkbcomp/Makefile            |  10 +++++-----
 external/mit/xorg/bin/xkbcomp/Makefile.common     |   6 ++++--
 external/mit/xorg/server/xorg-server/xkb/Makefile |  10 ++++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diffs (69 lines):

diff -r 4cac905a3922 -r 82c6b74085a5 external/mit/xorg/bin/xkbcomp/Makefile
--- a/external/mit/xorg/bin/xkbcomp/Makefile    Thu May 20 12:09:45 2010 +0000
+++ b/external/mit/xorg/bin/xkbcomp/Makefile    Thu May 20 12:51:16 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2009/10/01 02:27:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2010/05/20 12:51:16 christos Exp $
 
 .include <bsd.own.mk>
 .include "Makefile.common"
@@ -9,16 +9,16 @@
        symbols.c geometry.c xkbpath.c listing.c \
        xkbparse.y parseutils.c utils.c
 
-CPPFLAGS.xkbpath.c=    -DDFLT_XKB_CONFIG_ROOT=\"${XKBCOMPDIR}\"
+CPPFLAGS.xkbpath.c=    -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\"
 
 CPPFLAGS+=             -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
 CPPFLAGS.geometry.c=   -Wno-error      # XXX
 
-FILESDIR=${X11LIBDIR}/xkb
+FILESDIR=${XKBROOTDIR}
 FILES= README README.config README.enhancing
 
-SYMLINKS+=     ${BINDIR}/xkbcomp ${X11LIBDIR}/xkb/xkbcomp
-SYMLINKS+=     ${XKBCOMPDIR} ${X11LIBDIR}/xkb/compiled
+SYMLINKS+=     ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp
+SYMLINKS+=     ${XKBDATADIR} ${XKBCOMPDIR}
 
 LDADD+=        -lxkbfile -lXext -lX11
 DPADD+=        ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
diff -r 4cac905a3922 -r 82c6b74085a5 external/mit/xorg/bin/xkbcomp/Makefile.common
--- a/external/mit/xorg/bin/xkbcomp/Makefile.common     Thu May 20 12:09:45 2010 +0000
+++ b/external/mit/xorg/bin/xkbcomp/Makefile.common     Thu May 20 12:51:16 2010 +0000
@@ -1,3 +1,5 @@
-#      $NetBSD: Makefile.common,v 1.2 2009/10/01 02:27:59 mrg Exp $
+#      $NetBSD: Makefile.common,v 1.3 2010/05/20 12:51:16 christos Exp $
 
-XKBCOMPDIR=    ${X11LIBDIR}/xkb
+XKBROOTDIR=    ${X11LIBDIR}/xkb
+XKBCOMPDIR=    ${XKBROOTDIR}/compiled  # actually a link to ${XKBDATADIR}
+XKBDATADIR=    /var/db/xkb             # must be writable!
diff -r 4cac905a3922 -r 82c6b74085a5 external/mit/xorg/server/xorg-server/xkb/Makefile
--- a/external/mit/xorg/server/xorg-server/xkb/Makefile Thu May 20 12:09:45 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/xkb/Makefile Thu May 20 12:51:16 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2009/09/25 06:07:06 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2010/05/20 12:51:17 christos Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -30,13 +30,15 @@
                -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
                -I${X11SRCDIR.xorg-server}/../include
 
-# For ${XKBCOMPDIR}
+# For ${XKBROOTDIR} and ${XKBCOMPDIR}
 .include "../../../bin/xkbcomp/Makefile.common"
 
+# XXX: ddxLoad.c expects XKM_OUTPUT_DIR to have a trailing '/'.
+
 CPPFLAGS+=     -DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H \
-               -DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
+               -DXKB_BASE_DIRECTORY=\"${XKBROOTDIR}\" \
                -DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
-               -DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}\" \
+               -DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}/\" \
                -DXKB_DFLT_DISABLED=0
 
 COPTS.XKBAlloc.c=      -Wno-error      # XXX gcc 3.3