svn commit: r313602 - in stable/10/lib/libthr: . support

[Ngie Cooper]

Author: ngie
Date: Sat Feb 11 06:35:29 2017
New Revision: 313602
URL: https://svnweb.freebsd.org/changeset/base/313602

Log:
  MFC r312474:
  
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones
  
  This implifies pathing in make/displayed output

Modified:
  stable/10/lib/libthr/Makefile
  stable/10/lib/libthr/support/Makefile.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libthr/Makefile
==============================================================================
--- stable/10/lib/libthr/Makefile	Sat Feb 11 06:33:46 2017	(r313601)
+++ stable/10/lib/libthr/Makefile	Sat Feb 11 06:35:29 2017	(r313602)
@@ -17,13 +17,13 @@ LIB=thr
 SHLIB_MAJOR= 3
 WARNS?=	3
 CFLAGS+=-DPTHREAD_KERNEL
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-	-I${.CURDIR}/../../include
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}/thread \
+	-I${SRCTOP}/include
 CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
 CFLAGS+=-I${.CURDIR}/sys
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH}
-CFLAGS+=-I${.CURDIR}/../libthread_db
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH}
+CFLAGS+=-I${SRCTOP}/lib/libthread_db
 CFLAGS+=-Winline
 
 .ifndef NO_THREAD_UNWIND_STACK
@@ -33,7 +33,7 @@ CFLAGS+=-D_PTHREAD_FORCED_UNWIND
 
 LDFLAGS+=-Wl,-znodelete
 
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=${.CURDIR}/pthread.map
 
 MAN=	libthr.3

Modified: stable/10/lib/libthr/support/Makefile.inc
==============================================================================
--- stable/10/lib/libthr/support/Makefile.inc	Sat Feb 11 06:33:46 2017	(r313601)
+++ stable/10/lib/libthr/support/Makefile.inc	Sat Feb 11 06:35:29 2017	(r313602)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
+.PATH: ${.CURDIR}/support ${SRCTOP}/lib/libc/gen ${SRCTOP}/lib/libc/string
 
 # libc must search machine_arch, then machine_cpuarch, but libthr has all its
 # code implemented in machine_cpuarch.  Cope.
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys)
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH}
+.if exists(${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys)
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_ARCH}
 .else
-.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH}
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_CPUARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_CPUARCH}
 .endif
 
 SYSCALLS= thr_new