diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2008-03-05 20:58:15 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2008-03-05 20:58:15 +0000 |
| commit | ac188d74d602f639ecd8c4a5b5a81efa64ee0e9a (patch) | |
| tree | c5b55d8311ec22264e4dd2bf204e764298000959 /secure/usr.bin/ssh | |
| parent | b9d442c148d4ccf4e3b41becf690dfec94a075e0 (diff) | |
Notes
Diffstat (limited to 'secure/usr.bin/ssh')
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 1c666ab77170..33bdba1b2088 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -22,7 +22,16 @@ DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi .endif -.if defined(X11BASE) +.if defined(X11BASE) || defined(LOCALBASE) +# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org +# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/ +# so we need to provide the default for users with old make.conf +# settings. +LOCALBASE?= /usr/local + +# Users may override either LOCALBASE or X11BASE to move the location +# of xauth +X11BASE?= ${LOCALBASE} CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" .endif |