diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2010-08-04 22:50:52 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2010-08-04 22:50:52 +0000 |
| commit | 3eeb23cf568289f1578951ba2b5576c80e2acac8 (patch) | |
| tree | 998e320ccb9b8b4b6c0bb6c6d3008638c72a997b /share/mk/bsd.xorg.mk | |
| parent | 23b2f390ec64d9ecf3ba37ad04674458f13ef3d5 (diff) | |
enforce a consistent path in configure, avoid all kind of trouble with X
picking up ports from /usr/local.
okay matthieu@
Diffstat (limited to 'share/mk/bsd.xorg.mk')
| -rw-r--r-- | share/mk/bsd.xorg.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk index cd166c90d..ebe786125 100644 --- a/share/mk/bsd.xorg.mk +++ b/share/mk/bsd.xorg.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xorg.mk,v 1.34 2010/05/08 10:32:12 matthieu Exp $ -*- makefile -*- +# $OpenBSD: bsd.xorg.mk,v 1.35 2010/08/04 22:50:51 espie Exp $ -*- makefile -*- # # Copyright © 2006 Matthieu Herrb # @@ -52,9 +52,12 @@ CONFIG_SITE= ${XSRCDIR}/etc/config.site _SRCDIR?= ${.CURDIR} +XENOCARA_PATH?= /bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin + CONFIGURE_ENV= PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \ CONFIG_SITE=$(CONFIG_SITE) \ CFLAGS="$(CFLAGS:C/ *$//)" \ + PATH=$(XENOCARA_PATH) \ MAKE="${MAKE}" AUTOTOOLS_ENV= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \ |