summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/xkbcomp/Makefile.bsd-wrapper4
-rw-r--r--data/xkbdata/Makefile.bsd-wrapper4
-rw-r--r--etc/mtree/BSD.x11.dist90
-rw-r--r--lib/libXt/Makefile.bsd-wrapper4
4 files changed, 54 insertions, 48 deletions
diff --git a/app/xkbcomp/Makefile.bsd-wrapper b/app/xkbcomp/Makefile.bsd-wrapper
index 689920720..d974822cb 100644
--- a/app/xkbcomp/Makefile.bsd-wrapper
+++ b/app/xkbcomp/Makefile.bsd-wrapper
@@ -1,3 +1,5 @@
-# $Xenocara: Makefile.bsd-wrapper,v 1.3 2006/04/17 13:25:39 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:16:59 matthieu Exp $
+
+CONFIGURE_ARGS= --datadir=$(LIBDIR)
.include <bsd.xorg.mk>
diff --git a/data/xkbdata/Makefile.bsd-wrapper b/data/xkbdata/Makefile.bsd-wrapper
index 409cccecd..d974822cb 100644
--- a/data/xkbdata/Makefile.bsd-wrapper
+++ b/data/xkbdata/Makefile.bsd-wrapper
@@ -1,3 +1,5 @@
-# $Xenocara: Makefile.bsd-wrapper,v 1.3 2006/04/17 13:29:58 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:16:59 matthieu Exp $
+
+CONFIGURE_ARGS= --datadir=$(LIBDIR)
.include <bsd.xorg.mk>
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index 053de263c..ff0abaaaf 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-# $OpenBSD: BSD.x11.dist,v 1.1 2006/11/25 14:57:28 matthieu Exp $
+# $OpenBSD: BSD.x11.dist,v 1.2 2006/11/27 19:16:59 matthieu Exp $
# $FreeBSD: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp $
#
@@ -56,6 +56,8 @@
..
lib
X11
+ app-defaults
+ ..
config
..
doc
@@ -144,6 +146,48 @@
..
xinit
..
+ xkb
+ compat
+ ..
+ compiled
+ ..
+ geometry
+ digital
+ ..
+ sgi
+ ..
+ ..
+ keycodes
+ digital
+ ..
+ sgi
+ ..
+ ..
+ keymap
+ digital
+ ..
+ sgi
+ ..
+ sun
+ ..
+ ..
+ rules
+ ..
+ semantics
+ ..
+ symbols
+ digital
+ ..
+ fujitsu
+ ..
+ nec
+ ..
+ sony
+ ..
+ sun
+ ..
+ ..
+ ..
xserver
..
xsm
@@ -194,50 +238,6 @@
..
share
X11
- app-defaults
- ..
- xkb
- compat
- ..
- compiled
- ..
- geometry
- digital
- ..
- sgi
- ..
- ..
- keycodes
- digital
- ..
- sgi
- ..
- ..
- keymap
- digital
- ..
- sgi
- ..
- sun
- ..
- ..
- rules
- ..
- semantics
- ..
- symbols
- digital
- ..
- fujitsu
- ..
- nec
- ..
- sony
- ..
- sun
- ..
- ..
- ..
..
aclocal
..
diff --git a/lib/libXt/Makefile.bsd-wrapper b/lib/libXt/Makefile.bsd-wrapper
index 28f6cac2a..8c572b977 100644
--- a/lib/libXt/Makefile.bsd-wrapper
+++ b/lib/libXt/Makefile.bsd-wrapper
@@ -1,5 +1,7 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/26 12:07:34 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:16:59 matthieu Exp $
SHARED_LIBS= Xt 9.0
+CONFIGURE_ARGS= --with-appdefaultdir=$(LIBDIR)/X11/app-defaults
+
.include <bsd.xorg.mk>