[src/trunk]: src/external/gpl2/dtc Adjust build for new source location for r...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fb195c959759
branches:  trunk
changeset: 354252:fb195c959759
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Jun 08 18:57:21 2017 +0000

description:
Adjust build for new source location for real.

diffstat:

 external/gpl2/dtc/Makefile.inc         |   5 +++--
 external/gpl2/dtc/lib/libfdt/Makefile  |   8 ++++----
 external/gpl2/dtc/usr.bin/dtc/Makefile |  10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diffs (66 lines):

diff -r 9004d61618cb -r fb195c959759 external/gpl2/dtc/Makefile.inc
--- a/external/gpl2/dtc/Makefile.inc    Thu Jun 08 18:27:05 2017 +0000
+++ b/external/gpl2/dtc/Makefile.inc    Thu Jun 08 18:57:21 2017 +0000
@@ -1,4 +1,5 @@
-#      $NetBSD: Makefile.inc,v 1.1 2017/06/05 18:59:43 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2017/06/08 18:57:21 skrll Exp $
 
 BINDIR=                /usr/bin
-DIST=          ${NETBSDSRCDIR}/external/gpl2/dtc/dist
+DTCDIST=       ${NETBSDSRCDIR}/external/gpl2/dtc/dist
+LIBFDTDIST=    ${NETBSDSRCDIR}/sys/external/bsd/libfdt/dist
diff -r 9004d61618cb -r fb195c959759 external/gpl2/dtc/lib/libfdt/Makefile
--- a/external/gpl2/dtc/lib/libfdt/Makefile     Thu Jun 08 18:27:05 2017 +0000
+++ b/external/gpl2/dtc/lib/libfdt/Makefile     Thu Jun 08 18:57:21 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2017/06/08 17:24:31 skrll Exp $
+#      $NetBSD: Makefile,v 1.3 2017/06/08 18:57:21 skrll Exp $
 
 LIBISPRIVATE=  yes
 
@@ -7,13 +7,13 @@
 LIB=   fdt
 
 .include "${.CURDIR}/../../Makefile.inc"
-.include "${.CURDIR}/../../../../../sys/external/bsd/libfdt/dist/Makefile.libfdt"
+.include "${LIBFDTDIST}/Makefile.libfdt"
 
 SRCS=  ${LIBFDT_SRCS}
 
-CPPFLAGS+=     -I ${DIST}/libfdt
+CPPFLAGS+=     -I ${LIBFDTDIST}
 
-.PATH: ${DIST}/libfdt
+.PATH: ${LIBFDTDIST}
 
 .include <bsd.lib.mk>
 
diff -r 9004d61618cb -r fb195c959759 external/gpl2/dtc/usr.bin/dtc/Makefile
--- a/external/gpl2/dtc/usr.bin/dtc/Makefile    Thu Jun 08 18:27:05 2017 +0000
+++ b/external/gpl2/dtc/usr.bin/dtc/Makefile    Thu Jun 08 18:57:21 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2017/06/08 18:57:21 skrll Exp $
 
 NOMAN= # defined
 
@@ -7,15 +7,15 @@
 PROG=  dtc
 
 .include "${.CURDIR}/../../Makefile.inc"
-.include "${DIST}/Makefile.dtc"
+.include "${DTCDIST}/Makefile.dtc"
 
 CPPFLAGS+=     -I${.CURDIR}
-CPPFLAGS+=     -I${DIST}
-CPPFLAGS+=     -I${DIST}/libfdt
+CPPFLAGS+=     -I${DTCDIST}
+CPPFLAGS+=     -I${LIBFDTDIST}
 
 SRCS+= ${DTC_SRCS} dtc-lexer.l dtc-parser.y
 YFLAGS+= -d -L
 
-.PATH: ${DIST}
+.PATH: ${DTCDIST}
 
 .include <bsd.prog.mk>