From 86585fc2ec4e9f417a713deb476dd04fa0a005a3 Mon Sep 17 00:00:00 2001 From: espie Date: Wed, 4 Aug 2010 22:50:51 +0000 Subject: [PATCH] enforce a consistent path in configure, avoid all kind of trouble with X picking up ports from /usr/local. okay matthieu@ --- share/mk/bsd.xorg.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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)" \