[src/trunk]: src/external/gpl3/binutils/usr.bin Use the right variable to get...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/efc97e282933
branches:  trunk
changeset: 747605:efc97e282933
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Sep 23 19:41:24 2009 +0000

description:
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.

diffstat:

 external/gpl3/binutils/usr.bin/Makefile        |  6 +++---
 external/gpl3/binutils/usr.bin/common/Makefile |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 20b4d54620a3 -r efc97e282933 external/gpl3/binutils/usr.bin/Makefile
--- a/external/gpl3/binutils/usr.bin/Makefile   Wed Sep 23 19:07:19 2009 +0000
+++ b/external/gpl3/binutils/usr.bin/Makefile   Wed Sep 23 19:41:24 2009 +0000
@@ -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
 
diff -r 20b4d54620a3 -r efc97e282933 external/gpl3/binutils/usr.bin/common/Makefile
--- a/external/gpl3/binutils/usr.bin/common/Makefile    Wed Sep 23 19:07:19 2009 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile    Wed Sep 23 19:41:24 2009 +0000
@@ -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}