summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2016-04-18 13:13:59 +0000
committeremaste <emaste@FreeBSD.org>2016-04-18 13:13:59 +0000
commit60b9a1732824c56bf505a3a813256b4bc8034845 (patch)
treeb2b7fab482a8b2171347dff667a0bba5cbb0e332 /usr.bin
parent20ff6f85018a001538b2869d32474b5c1b42cd53 (diff)
downloadFreeBSD-src-60b9a1732824c56bf505a3a813256b4bc8034845.zip
FreeBSD-src-60b9a1732824c56bf505a3a813256b4bc8034845.tar.gz
Replace ${CURDIR}/../.. with ${CURDIR:H:H} in elftoolchain
This produces a nicer path in debug info and build logs. MFC after: 1 week Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/addr2line/Makefile2
-rw-r--r--usr.bin/cxxfilt/Makefile2
-rw-r--r--usr.bin/elfcopy/Makefile2
-rw-r--r--usr.bin/nm/Makefile2
-rw-r--r--usr.bin/readelf/Makefile2
-rw-r--r--usr.bin/size/Makefile2
-rw-r--r--usr.bin/strings/Makefile2
7 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/addr2line/Makefile b/usr.bin/addr2line/Makefile
index 918707a..6fe20f3 100644
--- a/usr.bin/addr2line/Makefile
+++ b/usr.bin/addr2line/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ADDR2LINEDIR= ${ELFTCDIR}/addr2line
.PATH: ${ADDR2LINEDIR}
diff --git a/usr.bin/cxxfilt/Makefile b/usr.bin/cxxfilt/Makefile
index 496b240..0f7b596 100644
--- a/usr.bin/cxxfilt/Makefile
+++ b/usr.bin/cxxfilt/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
SRCDIR= ${ELFTCDIR}/cxxfilt
.PATH: ${SRCDIR}
diff --git a/usr.bin/elfcopy/Makefile b/usr.bin/elfcopy/Makefile
index 0800a0c..444fa18 100644
--- a/usr.bin/elfcopy/Makefile
+++ b/usr.bin/elfcopy/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
ELFCOPYDIR= ${ELFTCDIR}/elfcopy
.PATH: ${ELFCOPYDIR}
diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile
index 5078e10..0b8e223 100644
--- a/usr.bin/nm/Makefile
+++ b/usr.bin/nm/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
NMDIR= ${ELFTCDIR}/nm
.PATH: ${NMDIR}
diff --git a/usr.bin/readelf/Makefile b/usr.bin/readelf/Makefile
index 1905112..4919f7a 100644
--- a/usr.bin/readelf/Makefile
+++ b/usr.bin/readelf/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
READELFDIR= ${ELFTCDIR}/readelf
.PATH: ${READELFDIR}
diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile
index 6aba73d..54b512b 100644
--- a/usr.bin/size/Makefile
+++ b/usr.bin/size/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
SIZEDIR= ${ELFTCDIR}/size
.PATH: ${SIZEDIR}
diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile
index 8543dcf..68e37b8 100644
--- a/usr.bin/strings/Makefile
+++ b/usr.bin/strings/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain
.PATH: ${ELFTCDIR}/strings
OpenPOWER on IntegriCloud