Module Name: src
Committed By: christos
Date: Thu May 20 12:51:17 UTC 2010
Modified Files:
src/external/mit/xorg/bin/xkbcomp: Makefile Makefile.common
src/external/mit/xorg/server/xorg-server/xkb: Makefile
Log Message:
Allow the build to work on a read-only source tree. From Anon Ymous
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xkbcomp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xkbcomp/Makefile.common
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/xkb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xkbcomp/Makefile
diff -u src/external/mit/xorg/bin/xkbcomp/Makefile:1.5 src/external/mit/xorg/bin/xkbcomp/Makefile:1.6
--- src/external/mit/xorg/bin/xkbcomp/Makefile:1.5 Wed Sep 30 22:27:59 2009
+++ src/external/mit/xorg/bin/xkbcomp/Makefile Thu May 20 08:51:16 2010
@@ -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}
Index: src/external/mit/xorg/bin/xkbcomp/Makefile.common
diff -u src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.2 src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.3
--- src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.2 Wed Sep 30 22:27:59 2009
+++ src/external/mit/xorg/bin/xkbcomp/Makefile.common Thu May 20 08:51:16 2010
@@ -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!
Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.6 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.6 Fri Sep 25 02:07:06 2009
+++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Thu May 20 08:51:17 2010
@@ -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
