diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-03-25 23:41:51 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-03-25 23:41:51 +0000 |
| commit | 28a817eb7db2b6e503c2664c7d3683be0e3ce5f3 (patch) | |
| tree | 6ce16dcf1a00f9d4a692ea93e91d6258a79c3316 /xserver/Makefile.bsd-wrapper | |
| parent | d0296cb2dca77008ac87984bf5fff52ca809195d (diff) | |
Introduce bsd.xconf.mk to set default config variables used
at several places in the Xenocara build in a central place instead
of duplicating the checks all over the place. ok oga@.
Diffstat (limited to 'xserver/Makefile.bsd-wrapper')
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index 4f69d846d..283a7c6cb 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.20 2008/02/13 21:34:15 miod Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.21 2008/03/25 23:41:50 matthieu Exp $ -.include <bsd.own.mk> +.include <bsd.xconf.mk> DIST= ${.CURDIR} @@ -27,12 +27,11 @@ NO_XF86_UTIL_${M} = --disable-xfree86-utils .endfor NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}} -.if ${MACHINE} != "landisk" && ${MACHINE} != "sgi" && ${MACHINE} != "vax" && \ - ${MACHINE_ARCH} != "m68k" +.if ${XENOCARA_BUILD_GL:L} == "yes" MESA_SOURCE= --with-mesa-source=${XSRCDIR}/dist/Mesa .endif -.if defined(XENOCARA_BUILD_DRI) && ${XENOCARA_BUILD_DRI:L} == "yes" +.if ${XENOCARA_BUILD_DRI:L} == "yes" DRI_OPTION= --enable-dri --with-dri-driver-path=${X11BASE}/lib/modules/dri .endif |