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.
This commit is contained in:
parent
5fab894c54
commit
cfe9d8b4dc
|
@ -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
|
||||
|
||||
|
|
|
@ -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 @@ ${TEXINFO}: bfdver.texi
|
|||
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}
|
||||
|
|
Loading…
Reference in New Issue