summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2017-02-11 07:02:04 +0000
committerngie <ngie@FreeBSD.org>2017-02-11 07:02:04 +0000
commit8097e3756b1edfe55a9d70567ebba25915350127 (patch)
tree80e0bfd8e68e13baf6d52bb01f6a78dc0bd8e5a9
parenta345bd0dee6ea94e2427fea79bab3447d5e31391 (diff)
downloadFreeBSD-src-8097e3756b1edfe55a9d70567ebba25915350127.zip
FreeBSD-src-8097e3756b1edfe55a9d70567ebba25915350127.tar.gz
MFC r312506:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones This simplifies pathing in make/displayed output
-rw-r--r--lib/libiconv_modules/Makefile.inc4
-rw-r--r--lib/libiconv_modules/mapper_parallel/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc
index 3b25374..d24c616 100644
--- a/lib/libiconv_modules/Makefile.inc
+++ b/lib/libiconv_modules/Makefile.inc
@@ -1,10 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
SHLIB_MAJOR= 4
WARNS?= 6
-CFLAGS+= -I${.CURDIR}/../../libc/iconv
+CFLAGS+= -I${SRCTOP}/lib/libc/iconv
CFLAGS+= -Dbool=_Bool
diff --git a/lib/libiconv_modules/mapper_parallel/Makefile b/lib/libiconv_modules/mapper_parallel/Makefile
index b79c3ad..0008665 100644
--- a/lib/libiconv_modules/mapper_parallel/Makefile
+++ b/lib/libiconv_modules/mapper_parallel/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../mapper_serial
+.PATH: ${.CURDIR:H}/mapper_serial
SHLIB= mapper_parallel
SRCS+= citrus_mapper_serial.c
OpenPOWER on IntegriCloud