[Midnightbsd-cvs] src: Makefile: Deal with Xorg 7

[laffer1 at midnightbsd.org]

Log Message:
-----------
Deal with Xorg 7

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

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/usr.bin/ssh/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L secure/usr.bin/ssh/Makefile -L secure/usr.bin/ssh/Makefile -u -r1.3 -r1.4
--- secure/usr.bin/ssh/Makefile
+++ secure/usr.bin/ssh/Makefile
@@ -21,8 +21,17 @@
 LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
 .endif
 
-.if defined(X11BASE)
-CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
+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=\"${LOCALBASE}/bin/xauth\"
 .endif
 
 DPADD+=	${LIBCRYPT} ${LIBCRYPTO}