World: Remove the X11BASE variable master
authorFrançois Tigeot <ftigeot@wolfpond.org>
Sun, 23 Nov 2014 15:32:59 +0000 (16:32 +0100)
committerFrançois Tigeot <ftigeot@wolfpond.org>
Sun, 23 Nov 2014 17:49:56 +0000 (18:49 +0100)
Requested-by: marino
secure/usr.bin/ssh/Makefile
secure/usr.sbin/sshd/Makefile

index c4094e2..2852ba7 100644 (file)
@@ -10,8 +10,7 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \
        sshconnect.c sshconnect1.c sshconnect2.c mux.c \
        roaming_common.c roaming_client.c
 
-X11BASE?=      /usr/local
-CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
+CFLAGS+= -DXAUTH_PATH=\"/usr/local/bin/xauth\"
 
 .include "../../Makefile.ssh.common"
 .include <bsd.prog.mk>
index fc8c238..6cf2b32 100644 (file)
@@ -33,8 +33,7 @@ CFLAGS+=-DUSE_PAM -DHAVE_SECURITY_PAM_APPL_H \
 LDADD+=        -lopie
 DPADD+=        ${LIBOPIE}
 
-X11BASE?=      /usr/local
-CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
+CFLAGS+= -DXAUTH_PATH=\"/usr/local/bin/xauth\"
 
 LDADD+=        -lcrypt -lwrap ${MINUSLPAM}
 DPADD+=        ${LIBCRYPT} ${LIBWRAP} ${LIBPAM}