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
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
