Index: stable/10/lib/libpam/modules/Makefile.inc
===================================================================
--- stable/10/lib/libpam/modules/Makefile.inc	(revision 313578)
+++ stable/10/lib/libpam/modules/Makefile.inc	(revision 313579)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
-PAMDIR=		${.CURDIR}/../../../../contrib/openpam
+PAMDIR=		${SRCTOP}/contrib/openpam
 
 NO_INSTALLLIB=
 NO_PROFILE=
 
-CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam
 
 # This is nasty.
 # For the static case, libpam.a depends on the modules.
 # For the dynamic case, the modules depend on libpam.so.N
 .if defined(_NO_LIBPAM_SO_YET)
 NO_PIC=
 .else
 SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
 DPADD+=		${LIBPAM}
 LDADD+=		-lpam
 .endif
 
 .include "../Makefile.inc"
Index: stable/10/lib/libpam/modules/pam_passwdqc/Makefile
===================================================================
--- stable/10/lib/libpam/modules/pam_passwdqc/Makefile	(revision 313578)
+++ stable/10/lib/libpam/modules/pam_passwdqc/Makefile	(revision 313579)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
-SRCDIR=	${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+SRCDIR=	${SRCTOP}/contrib/pam_modules/pam_passwdqc
 .PATH: ${SRCDIR}
 
 LIB=	pam_passwdqc
 SRCS=	pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c
 MAN=	pam_passwdqc.8
 
 WARNS?=	2
 CFLAGS+= -I${SRCDIR}
 
 DPADD=	${LIBCRYPT}
 LDADD=	-lcrypt
 
 .include <bsd.lib.mk>
 
Index: stable/10/lib/libpam/modules/pam_ssh/Makefile
===================================================================
--- stable/10/lib/libpam/modules/pam_ssh/Makefile	(revision 313578)
+++ stable/10/lib/libpam/modules/pam_ssh/Makefile	(revision 313579)
@@ -1,20 +1,20 @@
 # PAM module for SSH
 # $FreeBSD$
 
-SSHDIR=	${.CURDIR}/../../../../crypto/openssh
+SSHDIR=	${SRCTOP}/crypto/openssh
 
 LIB=	pam_ssh
 MAN=	pam_ssh.8
 SRCS=	pam_ssh.c
 
 WARNS?=	5
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 SRCS+=	 ssh_namespace.h
 
 DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
 LDADD=	-lssh -lcrypto -lcrypt
 USEPRIVATELIB= ssh
 
 .include <bsd.lib.mk>
 
 .PATH: ${SSHDIR}
Index: stable/10
===================================================================
--- stable/10	(revision 313578)
+++ stable/10	(revision 313579)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r312452