diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-11 05:41:53 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-11 05:41:53 +0000 |
| commit | a3e502df16f5e65c2c7a85cf7914ad1b1a6b7fa3 (patch) | |
| tree | 8bd65ac87c11a2a3cdf7a3a12051186d0f4f5333 /lib | |
| parent | d7477941dbaca1a8f2916a367c2926e5fd74c7e6 (diff) | |
| download | FreeBSD-src-a3e502df16f5e65c2c7a85cf7914ad1b1a6b7fa3.zip FreeBSD-src-a3e502df16f5e65c2c7a85cf7914ad1b1a6b7fa3.tar.gz | |
MFC r312452:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones
This implifies pathing in make/displayed output
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpam/modules/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_passwdqc/Makefile | 2 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_ssh/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index 8ff6ca6..f11c4ca 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -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. diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile index c9cc30e..97bffeb 100644 --- a/lib/libpam/modules/pam_passwdqc/Makefile +++ b/lib/libpam/modules/pam_passwdqc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SRCDIR= ${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc +SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc .PATH: ${SRCDIR} LIB= pam_passwdqc diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 56f3781..8cb4cb9 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -1,7 +1,7 @@ # PAM module for SSH # $FreeBSD$ -SSHDIR= ${.CURDIR}/../../../../crypto/openssh +SSHDIR= ${SRCTOP}/crypto/openssh LIB= pam_ssh MAN= pam_ssh.8 |
