summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2008-03-25 23:35:57 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2008-03-25 23:35:57 +0000
commit353874ab9e5533e2e269e28eb14fac00e5b00fb0 (patch)
treea1c77e5b1aa5cb44d2014649748bd45862da1b8e
parentd8ccad937af4bb0ff9f61fa3b5784866bce6d945 (diff)
Add a bsd.xconf.mk glue file, to be included at the start of Xenocara
makefiles. ok oga@.
-rw-r--r--share/mk/Makefile4
-rw-r--r--share/mk/bsd.xconf.mk7
2 files changed, 9 insertions, 2 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 615b2febdab..287bbe3f0a3 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2006/11/25 14:52:34 matthieu Exp $
+# $OpenBSD: Makefile,v 1.10 2008/03/25 23:35:56 matthieu Exp $
# $NetBSD: Makefile,v 1.12 1995/10/22 00:45:53 christos Exp $
FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \
bsd.obj.mk bsd.own.mk bsd.port.mk bsd.port.subdir.mk bsd.prog.mk \
bsd.regress.mk bsd.subdir.mk bsd.sys.mk sys.mk bsd.lkm.mk \
- bsd.xorg.mk
+ bsd.xconf.mk bsd.xorg.mk
NOOBJ= noobj
install:
diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk
new file mode 100644
index 00000000000..417f35919b3
--- /dev/null
+++ b/share/mk/bsd.xconf.mk
@@ -0,0 +1,7 @@
+# $OpenBSD: bsd.xconf.mk,v 1.1 2008/03/25 23:35:56 matthieu Exp $
+.include <bsd.own.mk>
+X11BASE?= /usr/X11R6
+X11ETC?= /etc/X11
+.if exists(${X11BASE}/share/mk/bsd.xconf.mk)
+. include "${X11BASE}/share/mk/bsd.xconf.mk"
+.endif