summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorschwarz <schwarz@pkgsrc.org>2006-09-10 20:14:43 +0000
committerschwarz <schwarz@pkgsrc.org>2006-09-10 20:14:43 +0000
commitaa38134c13d45adbbb6c101aa3c7a926a803c544 (patch)
treee6fed7d9aadee3561a1152a77b6d8619a9cf34f9 /mk
parentfde5fd0b4878fb2fa926756cf8d1171b848a4764 (diff)
downloadpkgsrc-aa38134c13d45adbbb6c101aa3c7a926a803c544.tar.gz
${X11BASE} can now be set to /usr, so just do so for IRIX and OSF1. No need
for any artificial symlinking any more in bootstrap.
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 e18710fe05d..970649f4a37 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.233 2006/08/26 19:07:00 schwarz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.234 2006/09/10 20:14:43 schwarz Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -366,6 +366,8 @@ X11_TYPE?= native
. if ${OPSYS} == "SunOS"
# On Solaris, we default to using OpenWindows for X11.
X11BASE?= ${DESTDIR}/usr/openwin
+.elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1"
+X11BASE?= ${DESTDIR}/usr
. else
X11BASE?= ${DESTDIR}/usr/X11R6
. endif