[Midnightbsd-cvs] src: Makefile: deal with xorg 7

[laffer1 at midnightbsd.org]

Log Message:
-----------
deal with xorg 7

Modified Files:
--------------
    src/secure/usr.sbin/sshd:
        Makefile (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/usr.sbin/sshd/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L secure/usr.sbin/sshd/Makefile -L secure/usr.sbin/sshd/Makefile -u -r1.3 -r1.4
--- secure/usr.sbin/sshd/Makefile
+++ secure/usr.sbin/sshd/Makefile
@@ -30,6 +30,14 @@
 .endif
 
 .if defined(X11BASE)
+# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
+# 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