Thu Jun 8 18:57:21 2017 UTC ()
Adjust build for new source location for real.


(skrll)
diff -r1.1 -r1.2 src/external/gpl2/dtc/Makefile.inc
diff -r1.2 -r1.3 src/external/gpl2/dtc/lib/libfdt/Makefile
diff -r1.1 -r1.2 src/external/gpl2/dtc/usr.bin/dtc/Makefile
cvs diff -r1.1 -r1.2 src/external/gpl2/dtc/Makefile.inc (expand / switch to unified diff)

--- src/external/gpl2/dtc/Makefile.inc 2017/06/05 18:59:43 1.1
+++ src/external/gpl2/dtc/Makefile.inc 2017/06/08 18:57:21 1.2
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
1# $NetBSD: Makefile.inc,v 1.1 2017/06/05 18:59:43 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2017/06/08 18:57:21 skrll Exp $
2 2
3BINDIR= /usr/bin 3BINDIR= /usr/bin
4DIST= ${NETBSDSRCDIR}/external/gpl2/dtc/dist 4DTCDIST= ${NETBSDSRCDIR}/external/gpl2/dtc/dist
 5LIBFDTDIST= ${NETBSDSRCDIR}/sys/external/bsd/libfdt/dist
cvs diff -r1.2 -r1.3 src/external/gpl2/dtc/lib/libfdt/Makefile (expand / switch to unified diff)

--- src/external/gpl2/dtc/lib/libfdt/Makefile 2017/06/08 17:24:31 1.2
+++ src/external/gpl2/dtc/lib/libfdt/Makefile 2017/06/08 18:57:21 1.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.2 2017/06/08 17:24:31 skrll Exp $ 1# $NetBSD: Makefile,v 1.3 2017/06/08 18:57:21 skrll Exp $
2 2
3LIBISPRIVATE= yes 3LIBISPRIVATE= yes
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7LIB= fdt 7LIB= fdt
8 8
9.include "${.CURDIR}/../../Makefile.inc" 9.include "${.CURDIR}/../../Makefile.inc"
10.include "${.CURDIR}/../../../../../sys/external/bsd/libfdt/dist/Makefile.libfdt" 10.include "${LIBFDTDIST}/Makefile.libfdt"
11 11
12SRCS= ${LIBFDT_SRCS} 12SRCS= ${LIBFDT_SRCS}
13 13
14CPPFLAGS+= -I ${DIST}/libfdt 14CPPFLAGS+= -I ${LIBFDTDIST}
15 15
16.PATH: ${DIST}/libfdt 16.PATH: ${LIBFDTDIST}
17 17
18.include <bsd.lib.mk> 18.include <bsd.lib.mk>
19 19
cvs diff -r1.1 -r1.2 src/external/gpl2/dtc/usr.bin/dtc/Makefile (expand / switch to unified diff)

--- src/external/gpl2/dtc/usr.bin/dtc/Makefile 2017/06/05 18:59:43 1.1
+++ src/external/gpl2/dtc/usr.bin/dtc/Makefile 2017/06/08 18:57:21 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $ 1# $NetBSD: Makefile,v 1.2 2017/06/08 18:57:21 skrll Exp $
2 2
3NOMAN= # defined 3NOMAN= # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7PROG= dtc 7PROG= dtc
8 8
9.include "${.CURDIR}/../../Makefile.inc" 9.include "${.CURDIR}/../../Makefile.inc"
10.include "${DIST}/Makefile.dtc" 10.include "${DTCDIST}/Makefile.dtc"
11 11
12CPPFLAGS+= -I${.CURDIR} 12CPPFLAGS+= -I${.CURDIR}
13CPPFLAGS+= -I${DIST} 13CPPFLAGS+= -I${DTCDIST}
14CPPFLAGS+= -I${DIST}/libfdt 14CPPFLAGS+= -I${LIBFDTDIST}
15 15
16SRCS+= ${DTC_SRCS} dtc-lexer.l dtc-parser.y 16SRCS+= ${DTC_SRCS} dtc-lexer.l dtc-parser.y
17YFLAGS+= -d -L 17YFLAGS+= -d -L
18 18
19.PATH: ${DIST} 19.PATH: ${DTCDIST}
20 20
21.include <bsd.prog.mk> 21.include <bsd.prog.mk>