Module Name: src
Committed By: snj
Date: Sun Oct 4 00:41:52 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xkbcomp [netbsd-5]: Makefile Makefile.common
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1062):
external/mit/xorg/bin/xkbcomp/Makefile: revision 1.5
external/mit/xorg/bin/xkbcomp/Makefile.common: revision 1.2
properly fix the xkbcomp output, and make compiled a symlink.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.8.2 -r1.1.1.1.8.3 \
src/external/mit/xorg/bin/xkbcomp/Makefile
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
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.1.1.1.8.2 src/external/mit/xorg/bin/xkbcomp/Makefile:1.1.1.1.8.3
--- src/external/mit/xorg/bin/xkbcomp/Makefile:1.1.1.1.8.2 Mon Sep 28 01:57:05 2009
+++ src/external/mit/xorg/bin/xkbcomp/Makefile Sun Oct 4 00:41:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1.8.2 2009/09/28 01:57:05 snj Exp $
+# $NetBSD: Makefile,v 1.1.1.1.8.3 2009/10/04 00:41:52 snj 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.2.2 src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.1.2.3
--- src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.1.2.2 Mon Sep 28 01:57:05 2009
+++ src/external/mit/xorg/bin/xkbcomp/Makefile.common Sun Oct 4 00:41:52 2009
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.common,v 1.1.2.2 2009/09/28 01:57:05 snj Exp $
+# $NetBSD: Makefile.common,v 1.1.2.3 2009/10/04 00:41:52 snj Exp $
-XKBCOMPDIR= /var/db/xkb
+XKBCOMPDIR= ${X11LIBDIR}/xkb
