Author: eadler
Date: Thu Mar 29 01:46:56 2012
New Revision: 233634
URL: http://svn.freebsd.org/changeset/base/233634
Log:
MFC r233136, r233432:
Restore the ability to use a non-standard LOCALBASE to sshd
Add the ability to use a non-standard LOCALBASE to ssh
Approved by: cperciva (implicit)
Modified:
stable/7/secure/usr.bin/ssh/Makefile
stable/7/secure/usr.sbin/sshd/Makefile
Directory Properties:
stable/7/secure/usr.bin/ssh/ (props changed)
stable/7/secure/usr.sbin/sshd/ (props changed)
Modified: stable/7/secure/usr.bin/ssh/Makefile
==============================================================================
--- stable/7/secure/usr.bin/ssh/Makefile Thu Mar 29 01:46:30 2012
(r233633)
+++ stable/7/secure/usr.bin/ssh/Makefile Thu Mar 29 01:46:56 2012
(r233634)
@@ -22,22 +22,13 @@ DPADD+= ${LIBGSSAPI}
LDADD+= -lgssapi
.endif
-.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
-
DPADD+= ${LIBCRYPT} ${LIBCRYPTO}
LDADD+= -lcrypt -lcrypto
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
Modified: stable/7/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/7/secure/usr.sbin/sshd/Makefile Thu Mar 29 01:46:30 2012
(r233633)
+++ stable/7/secure/usr.sbin/sshd/Makefile Thu Mar 29 01:46:56 2012
(r233634)
@@ -37,22 +37,13 @@ DPADD+= ${LIBGSSAPI} ${LIBGSSAPI_KRB5}
LDADD+= -lgssapi -lgssapi_krb5
.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
-
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
+.if defined(LOCALBASE)
+CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
+.endif
+
.include <bsd.prog.mk>
.PATH: ${SSHDIR}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
