From owner-svn-src-stable@freebsd.org  Sat Feb 11 05:41:55 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34C80CDACE2;
 Sat, 11 Feb 2017 05:41:55 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DBA0414C4;
 Sat, 11 Feb 2017 05:41:54 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1B5frWv078677;
 Sat, 11 Feb 2017 05:41:53 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1B5frLi078674;
 Sat, 11 Feb 2017 05:41:53 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201702110541.v1B5frLi078674@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 11 Feb 2017 05:41:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r313579 - in stable/10/lib/libpam/modules: . pam_passwdqc
 pam_ssh
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Feb 2017 05:41:55 -0000

Author: ngie
Date: Sat Feb 11 05:41:53 2017
New Revision: 313579
URL: https://svnweb.freebsd.org/changeset/base/313579

Log:
  MFC r312452:
  
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones
  
  This implifies pathing in make/displayed output

Modified:
  stable/10/lib/libpam/modules/Makefile.inc
  stable/10/lib/libpam/modules/pam_passwdqc/Makefile
  stable/10/lib/libpam/modules/pam_ssh/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libpam/modules/Makefile.inc
==============================================================================
--- stable/10/lib/libpam/modules/Makefile.inc	Sat Feb 11 05:33:49 2017	(r313578)
+++ stable/10/lib/libpam/modules/Makefile.inc	Sat Feb 11 05:41:53 2017	(r313579)
@@ -1,11 +1,11 @@
 # $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.

Modified: stable/10/lib/libpam/modules/pam_passwdqc/Makefile
==============================================================================
--- stable/10/lib/libpam/modules/pam_passwdqc/Makefile	Sat Feb 11 05:33:49 2017	(r313578)
+++ stable/10/lib/libpam/modules/pam_passwdqc/Makefile	Sat Feb 11 05:41:53 2017	(r313579)
@@ -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: stable/10/lib/libpam/modules/pam_ssh/Makefile
==============================================================================
--- stable/10/lib/libpam/modules/pam_ssh/Makefile	Sat Feb 11 05:33:49 2017	(r313578)
+++ stable/10/lib/libpam/modules/pam_ssh/Makefile	Sat Feb 11 05:41:53 2017	(r313579)
@@ -1,7 +1,7 @@
 # PAM module for SSH
 # $FreeBSD$
 
-SSHDIR=	${.CURDIR}/../../../../crypto/openssh
+SSHDIR=	${SRCTOP}/crypto/openssh
 
 LIB=	pam_ssh
 MAN=	pam_ssh.8