From owner-svn-src-all@FreeBSD.ORG  Tue May 25 13:27:56 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4396F1065674;
	Tue, 25 May 2010 13:27:56 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 193CB8FC26;
	Tue, 25 May 2010 13:27:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4PDRtev035486;
	Tue, 25 May 2010 13:27:55 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4PDRt7Q035485;
	Tue, 25 May 2010 13:27:55 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <201005251327.o4PDRt7Q035485@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Tue, 25 May 2010 13:27:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208536 - head/gnu/usr.bin/dtc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 May 2010 13:27:56 -0000

Author: raj
Date: Tue May 25 13:27:55 2010
New Revision: 208536
URL: http://svn.freebsd.org/changeset/base/208536

Log:
  Correct dtc version header autogen location.
  
  While there unify brackets usage.

Modified:
  head/gnu/usr.bin/dtc/Makefile

Modified: head/gnu/usr.bin/dtc/Makefile
==============================================================================
--- head/gnu/usr.bin/dtc/Makefile	Tue May 25 10:15:30 2010	(r208535)
+++ head/gnu/usr.bin/dtc/Makefile	Tue May 25 13:27:55 2010	(r208536)
@@ -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>