svn commit: r312452 - in head/lib/libpam/modules: . pam_passwdqc pam_ssh

[Ngie Cooper]

Author: ngie
Date: Fri Jan 20 03:27:47 2017
New Revision: 312452
URL: https://svnweb.freebsd.org/changeset/base/312452

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones
  
  This implifies pathing in make/displayed output
  
  MFC after:	3 weeks
  Sponsored by:	Dell EMC Isilon

Modified:
  head/lib/libpam/modules/Makefile.inc
  head/lib/libpam/modules/pam_passwdqc/Makefile
  head/lib/libpam/modules/pam_ssh/Makefile

Modified: head/lib/libpam/modules/Makefile.inc
==============================================================================
--- head/lib/libpam/modules/Makefile.inc	Fri Jan 20 03:23:24 2017	(r312451)
+++ head/lib/libpam/modules/Makefile.inc	Fri Jan 20 03:27:47 2017	(r312452)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-PAMDIR=		${.CURDIR}/../../../../contrib/openpam
+PAMDIR=		${SRCTOP}/contrib/openpam
 
 MK_INSTALLLIB=	no
 MK_PROFILE=	no
 
-CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam
 
 SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
 LIBADD+=	pam

Modified: head/lib/libpam/modules/pam_passwdqc/Makefile
==============================================================================
--- head/lib/libpam/modules/pam_passwdqc/Makefile	Fri Jan 20 03:23:24 2017	(r312451)
+++ head/lib/libpam/modules/pam_passwdqc/Makefile	Fri Jan 20 03:27:47 2017	(r312452)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR=	${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+SRCDIR=	${SRCTOP}/contrib/pam_modules/pam_passwdqc
 .PATH: ${SRCDIR}
 
 LIB=	pam_passwdqc

Modified: head/lib/libpam/modules/pam_ssh/Makefile
==============================================================================
--- head/lib/libpam/modules/pam_ssh/Makefile	Fri Jan 20 03:23:24 2017	(r312451)
+++ head/lib/libpam/modules/pam_ssh/Makefile	Fri Jan 20 03:27:47 2017	(r312452)
@@ -1,7 +1,7 @@
 # PAM module for SSH
 # $FreeBSD$
 
-SSHDIR=	${.CURDIR}/../../../../crypto/openssh
+SSHDIR=	${SRCTOP}/crypto/openssh
 
 LIB=	pam_ssh
 MAN=	pam_ssh.8