Correct dtc version header autogen location.

While there unify brackets usage.

1 files changed, 9 insertions, 9 deletions

diff --git a/gnu/usr.bin/dtc/Makefile b/gnu/usr.bin/dtc/Makefile
index 08f4ad5..873bced 100644
--- a/gnu/usr.bin/dtc/Makefile
+++ b/gnu/usr.bin/dtc/Makefile
@@ -11,18 +11,18 @@ PROG=	dtc
 SRCS=	dtc.c checks.c fstree.c livetree.c treesource.c data.c \
 	flattree.c srcpos.c util.c \
 	fdt.c fdt_ro.c fdt_rw.c fdt_strerror.c \
-	fdt_sw.c fdt_wip.c $(DTCDIR)/version_gen.h
+	fdt_sw.c fdt_wip.c ${DTCVERSIONFILE}
 
 CFLAGS = -Wall -g -Os -fPIC -Wpointer-arith -Wcast-qual
 CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${LIBFDTDIR}
 
-VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' $(DTCDIR)/Makefile
-VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' $(DTCDIR)/Makefile
-VERSIONSUB!= awk '/^SUBLEVEL =/ { print $$3 }' $(DTCDIR)/Makefile
-VERSIONEXTRA!= $(DTCDIR)/scripts/setlocalversion
+VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONSUB!= awk '/^SUBLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONEXTRA=
 
 DTCVERSION:=	${VERSIONMAJ}.${VERSIONMIN}.${VERSIONSUB}${VERSIONEXTRA}
-DTCVERSIONFILE:=	$(DTCDIR)/version_gen.h
+DTCVERSIONFILE:=	version_gen.h
 
 MAN=
 
@@ -34,18 +34,18 @@ OBJS+= dtc-parser.tab.o dtc-lexer.lex.o
 CLEANFILES+= dtc-parser.tab.o dtc-lexer.lex.o dtc-parser.tab.c \
 		dtc-parser.tab.h dtc-lexer.lex.c ${DTCVERSIONFILE}
 
-$(DTCVERSIONFILE):
+${DTCVERSIONFILE}:
 	@echo '#define DTC_VERSION "DTC ${DTCVERSION}"' > ${DTCVERSIONFILE}
 
 dtc-parser.tab.o:	dtc-parser.tab.c dtc-parser.tab.h
 dtc-lexer.lex.o:	dtc-lexer.lex.c dtc-parser.tab.h
 
 dtc-parser.tab.c:	dtc-parser.y
-	$(BISON) -o$@ -d $(DTCDIR)/dtc-parser.y
+	${BISON} -o$@ -d ${DTCDIR}/dtc-parser.y
 
 dtc-parser.tab.h:	dtc-parser.tab.c
 
 dtc-lexer.lex.c: dtc-lexer.l
-	$(LEX) -o$@ $(DTCDIR)/dtc-lexer.l
+	${LEX} -o$@ ${DTCDIR}/dtc-lexer.l
 
 .include <bsd.prog.mk>