aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-01-20 03:31:50 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-01-20 03:31:50 +0000
commitd85550da9d09ad12b5246122263905748493b267 (patch)
tree5fafc24a9a279ed79e802a4a7320d9d32937c629 /lib
parentc24988fd09896d88900391853254acf03328b08f (diff)
downloadsrc-d85550da9d09ad12b5246122263905748493b267.tar.gz
src-d85550da9d09ad12b5246122263905748493b267.zip
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
Notes
Notes: svn path=/head/; revision=312453
Diffstat (limited to 'lib')
-rw-r--r--lib/libpam/libpam/Makefile2
-rw-r--r--lib/libpam/static_libpam/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 1e634b705496..41863ad07c4f 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -36,7 +36,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-OPENPAM= ${.CURDIR}/../../../contrib/openpam
+OPENPAM= ${SRCTOP}/contrib/openpam
.PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man
# static_libpam will build libpam.a
diff --git a/lib/libpam/static_libpam/Makefile b/lib/libpam/static_libpam/Makefile
index ee49517649f9..9c393386efc6 100644
--- a/lib/libpam/static_libpam/Makefile
+++ b/lib/libpam/static_libpam/Makefile
@@ -35,7 +35,7 @@
#
# $FreeBSD$
-.PATH: ${.CURDIR}/../libpam
+.PATH: ${SRCTOP}/lib/libpam
# Only build the static library.
LIB= pam
@@ -66,4 +66,4 @@ CLEANFILES+= openpam_static.o \
openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
${CC} -nostdlib ${CFLAGS} -o ${.TARGET} -r -Wl,--whole-archive ${.ALLSRC}
-.include "${.CURDIR}/../libpam/Makefile"
+.include "${.CURDIR:H}/libpam/Makefile"