diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2008-03-22 15:13:26 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2008-03-22 15:13:26 +0000 |
| commit | 7dfaa2baad0b817a6f174c69b7f3b7dfc79414be (patch) | |
| tree | 8937f6804e332cbaa92211c8144b4d9507bde9c9 /secure | |
| parent | 8b763276677db8a46d14beee43c2fdc5f932017a (diff) | |
Notes
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 11 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 090b33ab5fec..15e25641ed1c 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -20,7 +20,16 @@ DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lroken .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 diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index c8f8f323f6f0..fcfa21bd77f1 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -36,6 +36,15 @@ LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lroken .endif .if defined(X11BASE) +# 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 |