Module Name: src
Committed By: skrll
Date: Thu Jun 8 18:57:21 UTC 2017
Modified Files:
src/external/gpl2/dtc: Makefile.inc
src/external/gpl2/dtc/lib/libfdt: Makefile
src/external/gpl2/dtc/usr.bin/dtc: Makefile
Log Message:
Adjust build for new source location for real.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/dtc/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/dtc/lib/libfdt/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/dtc/usr.bin/dtc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/dtc/Makefile.inc
diff -u src/external/gpl2/dtc/Makefile.inc:1.1 src/external/gpl2/dtc/Makefile.inc:1.2
--- src/external/gpl2/dtc/Makefile.inc:1.1 Mon Jun 5 18:59:43 2017
+++ src/external/gpl2/dtc/Makefile.inc Thu Jun 8 18:57:21 2017
@@ -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
Index: src/external/gpl2/dtc/lib/libfdt/Makefile
diff -u src/external/gpl2/dtc/lib/libfdt/Makefile:1.2 src/external/gpl2/dtc/lib/libfdt/Makefile:1.3
--- src/external/gpl2/dtc/lib/libfdt/Makefile:1.2 Thu Jun 8 17:24:31 2017
+++ src/external/gpl2/dtc/lib/libfdt/Makefile Thu Jun 8 18:57:21 2017
@@ -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 @@ LIBISPRIVATE= yes
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>
Index: src/external/gpl2/dtc/usr.bin/dtc/Makefile
diff -u src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.1 src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.2
--- src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.1 Mon Jun 5 18:59:43 2017
+++ src/external/gpl2/dtc/usr.bin/dtc/Makefile Thu Jun 8 18:57:21 2017
@@ -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 @@ NOMAN= # defined
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>
