Author: eadler
Date: Sat Mar 24 19:41:43 2012
New Revision: 233432
URL: http://svn.freebsd.org/changeset/base/233432
Log:
Restore the ability to use a non-standard LOCALBASE to sshd
Add the ability to use a non-standard LOCALBASE to ssh
Submitted by: jhb
Reviewed by: des
Approved by: cperciva
MFC after: 0 days (with r233136)
Modified:
head/secure/usr.bin/ssh/Makefile
head/secure/usr.sbin/sshd/Makefile
Modified: head/secure/usr.bin/ssh/Makefile
==============================================================================
--- head/secure/usr.bin/ssh/Makefile Sat Mar 24 19:14:44 2012
(r233431)
+++ head/secure/usr.bin/ssh/Makefile Sat Mar 24 19:41:43 2012
(r233432)
@@ -28,6 +28,10 @@ LDADD+= -lgssapi
DPADD+= ${LIBCRYPT} ${LIBCRYPTO}
LDADD+= -lcrypt -lcrypto
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
Modified: head/secure/usr.sbin/sshd/Makefile
==============================================================================
--- head/secure/usr.sbin/sshd/Makefile Sat Mar 24 19:14:44 2012
(r233431)
+++ head/secure/usr.sbin/sshd/Makefile Sat Mar 24 19:41:43 2012
(r233432)
@@ -43,6 +43,10 @@ LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
