From c0e5e7f3d2e1bac7ada43b35843e3a018777854e Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 18 Apr 2016 13:13:59 +0000 Subject: [PATCH] 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 --- lib/libdwarf/Makefile | 2 +- lib/libelf/Makefile | 2 +- lib/libelftc/Makefile | 2 +- usr.bin/addr2line/Makefile | 2 +- usr.bin/cxxfilt/Makefile | 2 +- usr.bin/elfcopy/Makefile | 2 +- usr.bin/nm/Makefile | 2 +- usr.bin/readelf/Makefile | 2 +- usr.bin/size/Makefile | 2 +- usr.bin/strings/Makefile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile index 1e2506d23e36..e23cb1f0d977 100644 --- a/lib/libdwarf/Makefile +++ b/lib/libdwarf/Makefile @@ -2,7 +2,7 @@ .include PACKAGE=lib${LIB} -TOP= ${.CURDIR}/../../contrib/elftoolchain +TOP= ${.CURDIR:H:H}/contrib/elftoolchain SRCDIR= ${TOP}/libdwarf .PATH: ${SRCDIR} diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile index 70d9e9bc423a..fc956bf73495 100644 --- a/lib/libelf/Makefile +++ b/lib/libelf/Makefile @@ -5,7 +5,7 @@ SHLIBDIR?= /lib .include -TOP= ${.CURDIR}/../../contrib/elftoolchain +TOP= ${.CURDIR:H:H}/contrib/elftoolchain SRCDIR= ${TOP}/libelf .PATH: ${SRCDIR} diff --git a/lib/libelftc/Makefile b/lib/libelftc/Makefile index e2269b41fcb4..7a4203dae4be 100644 --- a/lib/libelftc/Makefile +++ b/lib/libelftc/Makefile @@ -4,7 +4,7 @@ PACKAGE=lib${LIB} INTERNALLIB= -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain .PATH: ${ELFTCDIR}/libelftc diff --git a/usr.bin/addr2line/Makefile b/usr.bin/addr2line/Makefile index 918707a7e7e1..6fe20f30b10c 100644 --- a/usr.bin/addr2line/Makefile +++ b/usr.bin/addr2line/Makefile @@ -2,7 +2,7 @@ .include -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 496b240a79d5..0f7b5968698d 100644 --- a/usr.bin/cxxfilt/Makefile +++ b/usr.bin/cxxfilt/Makefile @@ -2,7 +2,7 @@ .include -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 0800a0c4fc88..444fa18ebbae 100644 --- a/usr.bin/elfcopy/Makefile +++ b/usr.bin/elfcopy/Makefile @@ -2,7 +2,7 @@ .include -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 5078e1030069..0b8e223ddf2d 100644 --- a/usr.bin/nm/Makefile +++ b/usr.bin/nm/Makefile @@ -2,7 +2,7 @@ .include -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 190511202dea..4919f7aabcca 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 6aba73da0c88..54b512bb6978 100644 --- a/usr.bin/size/Makefile +++ b/usr.bin/size/Makefile @@ -2,7 +2,7 @@ .include -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 8543dcf435fe..68e37b8bba9e 100644 --- a/usr.bin/strings/Makefile +++ b/usr.bin/strings/Makefile @@ -2,7 +2,7 @@ .include -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${.CURDIR:H:H}/contrib/elftoolchain .PATH: ${ELFTCDIR}/strings