summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2008-09-16 11:40:10 +0000
committertron <tron@pkgsrc.org>2008-09-16 11:40:10 +0000
commited5b1cca8dd68faca47cc395ed614e3a9be9ebe3 (patch)
tree63ebfa2dfc69df9e8109f787c28a2de5477e6801 /mk
parent291fb4772920a3954c3a26cb01a3486ab5e88f57 (diff)
downloadpkgsrc-ed5b1cca8dd68faca47cc395ed614e3a9be9ebe3.tar.gz
X11 is located in "/usr/X11" under Mac OS X Leopard, "/usr/X11R6" is just
a symlink. Use the correct directory because the buildlink framework will otherwise remove compiler options like "-I/usr/X11/include/pixman-1".
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index a75f6fd016f..e6add2cc6c9 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.286 2008/06/22 16:25:32 tnn Exp $
+# $NetBSD: bsd.prefs.mk,v 1.287 2008/09/16 11:40:10 tron Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -491,6 +491,8 @@ X11_TYPE?= native
X11BASE?= /usr/openwin
. elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX"
X11BASE?= /usr
+. elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
+X11BASE?= /usr/X11
. else
X11BASE?= /usr/X11R6
. endif