diff options
| author | jperkin <jperkin> | 2014-02-20 21:27:43 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-02-20 21:27:43 +0000 |
| commit | b94c392dcdbf91280f8eca307f77d3648f48ea1a (patch) | |
| tree | f62b0423d88bc2532c37c533bee8e805211777aa /mk | |
| parent | fcd9e53eab24d63cfcbc5af4080aa7b6d2743285 (diff) | |
| download | pkgsrc-b94c392dcdbf91280f8eca307f77d3648f48ea1a.tar.gz | |
Support X11BASE?=/usr for native X11 on RedHat and derivatives.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 27e634459a5..e18f6db1bc9 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.340 2014/02/14 07:43:46 obache Exp $ +# $NetBSD: bsd.prefs.mk,v 1.341 2014/02/20 21:27:43 jperkin Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -581,6 +581,8 @@ X11BASE?= /opt/X11 X11BASE?= /usr/X11R7 . elif exists(/usr/X11R7/lib/libX11.so) X11BASE?= /usr/X11R7 +. elif exists(/usr/lib/libX11.so) || exists(/usr/lib64/libX11.so) +X11BASE?= /usr . else X11BASE?= /usr/X11R6 . endif |