diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-10 07:32:40 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-10 07:32:40 +0000 |
| commit | 0d4e3d76af6dae0df115d1e23238a6e9d6438561 (patch) | |
| tree | 9a6d85969899c244a5fef4613119d1503130328a /lib/libpam/modules | |
| parent | ad0c9114e00a9a30168e0c13c17d8f65571aa67f (diff) | |
| download | FreeBSD-src-0d4e3d76af6dae0df115d1e23238a6e9d6438561.zip FreeBSD-src-0d4e3d76af6dae0df115d1e23238a6e9d6438561.tar.gz | |
MFC r312452-r312512:
r312452-r312512:
- Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones
This simplifies pathing in make/displayed output
- Use .CURDIR:H instead of .CURDIR to simplify pathing in output, etc
Diffstat (limited to 'lib/libpam/modules')
| -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 899c3cb..87885c3 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 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 diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile index cd23642..2b10fdc 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 8de1bdf..d2168b3 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 |
