diff options
| author | jlam <jlam@pkgsrc.org> | 2002-10-21 21:46:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-10-21 21:46:00 +0000 |
| commit | 4d0aee253be7d7a2819c7dbc778209a75e5ac04b (patch) | |
| tree | 61f641a299fa0fe1249293509290cb5c76d2b158 /mk | |
| parent | 70ed1a955d8cbc12ea6386af8785e66849db2e01 (diff) | |
| download | pkgsrc-4d0aee253be7d7a2819c7dbc778209a75e5ac04b.tar.gz | |
Move X11BASE setting for Solaris to a more appropriate place now that we
don't need to worry about USE_XPM.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index ec89b442c63..1708a02bbca 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.86 2002/10/21 13:58:18 wiz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.87 2002/10/21 21:46:00 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -82,8 +82,6 @@ MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH} . endif LOWER_VENDOR?= sun LOWER_OPSYS?= solaris -# We need to set this early to get "USE_XPM" working. -X11BASE?= ${DESTDIR}/usr/openwin .elif ${OPSYS} == "Linux" LOWER_OPSYS?= linux @@ -211,7 +209,12 @@ USE_INET6?= NO .endif LOCALBASE?= ${DESTDIR}/usr/pkg +.if ${OPSYS} == "SunOS" +# On Solaris, we default to using OpenWindows for X11. +X11BASE?= ${DESTDIR}/usr/openwin +.else X11BASE?= ${DESTDIR}/usr/X11R6 +.endif CROSSBASE?= ${LOCALBASE}/cross # Set X11PREFIX to reflect the install directory of X11 packages. |