Module Name: src
Committed By: mrg
Date: Thu Oct 1 02:27:59 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xkbcomp: Makefile Makefile.common
Log Message:
properly fix the xkbcomp output, and make compiled a symlink.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xkbcomp/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/xkbcomp/Makefile.common
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.4 src/external/mit/xorg/bin/xkbcomp/Makefile:1.5
--- src/external/mit/xorg/bin/xkbcomp/Makefile:1.4 Fri Sep 25 06:07:06 2009
+++ src/external/mit/xorg/bin/xkbcomp/Makefile Thu Oct 1 02:27:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/09/25 06:07:06 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/10/01 02:27:59 mrg Exp $
.include <bsd.own.mk>
.include "Makefile.common"
@@ -17,7 +17,8 @@
FILESDIR=${X11LIBDIR}/xkb
FILES= README README.config README.enhancing
-SYMLINKS+=${BINDIR}/xkbcomp ${X11LIBDIR}/xkb/xkbcomp
+SYMLINKS+= ${BINDIR}/xkbcomp ${X11LIBDIR}/xkb/xkbcomp
+SYMLINKS+= ${XKBCOMPDIR} ${X11LIBDIR}/xkb/compiled
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.1 src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.2
--- src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.1 Fri Sep 25 06:07:06 2009
+++ src/external/mit/xorg/bin/xkbcomp/Makefile.common Thu Oct 1 02:27:59 2009
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.common,v 1.1 2009/09/25 06:07:06 mrg Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/10/01 02:27:59 mrg Exp $
-XKBCOMPDIR= /var/db/xkb
+XKBCOMPDIR= ${X11LIBDIR}/xkb
