Module Name: src
Committed By: skrll
Date: Wed Sep 23 19:41:24 UTC 2009
Modified Files:
src/external/gpl3/binutils/usr.bin: Makefile
src/external/gpl3/binutils/usr.bin/common: Makefile
Log Message:
Use the right variable to get VERSION from the defs.mk file.
Add a .WAIT to hopefully fix the problem reported by Patrick Welche on
current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/common/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/gpl3/binutils/usr.bin/Makefile
diff -u src/external/gpl3/binutils/usr.bin/Makefile:1.2 src/external/gpl3/binutils/usr.bin/Makefile:1.3
--- src/external/gpl3/binutils/usr.bin/Makefile:1.2 Tue Sep 8 07:08:02 2009
+++ src/external/gpl3/binutils/usr.bin/Makefile Wed Sep 23 19:41:24 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/09/08 07:08:02 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/23 19:41:24 skrll Exp $
.include <bsd.own.mk>
.if ${MKBINUTILS} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk"
-SSUBDIR+= common gas gprof ld ${G_PROGRAMS:C/-new$//:C/sysdump//:C/srconv//:cxxfilt=c++filt}
-SUBDIR+= ${SSUBDIR:O} # alphabetize
+SSUBDIR+= gas gprof ld ${G_PROGRAMS:C/-new$//:C/sysdump//:C/srconv//:cxxfilt=c++filt}
+SUBDIR+= common .WAIT ${SSUBDIR:O} # alphabetize
.endif # MKBINUTILS != no
Index: src/external/gpl3/binutils/usr.bin/common/Makefile
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile:1.1 src/external/gpl3/binutils/usr.bin/common/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/common/Makefile:1.1 Tue Aug 18 20:22:08 2009
+++ src/external/gpl3/binutils/usr.bin/common/Makefile Wed Sep 23 19:41:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:08 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/23 19:41:24 skrll Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@
bfdver.texi: ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
${_MKTARGET_CREATE}
rm -f config.texi
- (echo "@set VERSION ${VERSION}"; \
+ (echo "@set VERSION ${G_VERSION}"; \
if [ -n "$(PKGVERSION)" ]; then \
echo "@set VERSION_PACKAGE $(PKGVERSION)"; \
fi) > ${.TARGET}
