fix version.c defines. now the version says:

gcc version 4.5.3 (NetBSD nb1 20110620)
instead of:
	gcc version 4.5.320110428
This commit is contained in:
mrg 2011-07-01 10:03:17 +00:00
parent 7c2e122f42
commit ae4d8014dc
1 changed files with 8 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.7 2011/06/29 02:15:13 mrg Exp $ # $NetBSD: Makefile.inc,v 1.8 2011/07/01 10:03:17 mrg Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -31,7 +31,11 @@ BASEVER!= cat ${GNUHOSTDIST}/gcc/BASE-VER
# XXX # XXX
#DEVPHASE!= cat ${GNUHOSTDIST}/gcc/DEV-PHASE #DEVPHASE!= cat ${GNUHOSTDIST}/gcc/DEV-PHASE
DEVPHASE= DEVPHASE=
.if ${DEVPHASE} == "release" || ${DEVPHASE} == ""
DATESTAMP=
.else
DATESTAMP!= cat ${GNUHOSTDIST}/gcc/DATESTAMP DATESTAMP!= cat ${GNUHOSTDIST}/gcc/DATESTAMP
.endif
BASEVERSTR= "\"$(BASEVER)\"" BASEVERSTR= "\"$(BASEVER)\""
.if !empty(DEVPHASE) .if !empty(DEVPHASE)
@ -39,7 +43,7 @@ DEVPHASESTR= "\" $(DEVPHASE)\""
.else .else
DEVPHASESTR= "\"\"" DEVPHASESTR= "\"\""
.endif .endif
.if !empty(DEVPHASE) .if !empty(DATESTAMP)
DATESTAMPSTR= "\" $(DATESTAMP)\"" DATESTAMPSTR= "\" $(DATESTAMP)\""
.else .else
DATESTAMPSTR= "\"\"" DATESTAMPSTR= "\"\""
@ -48,13 +52,13 @@ DATESTAMPSTR= "\"\""
# XXX pull this out of our configs # XXX pull this out of our configs
G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html> G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html>
G_BUGURL_s="\"${G_BUG_URL}\"" G_BUGURL_s="\"${G_BUG_URL}\""
G_PKGVERSION_s=(NetBSD nb1 20110620) G_PKGVERSION=(NetBSD nb1 20110620)
G_PKGVERSION_s="\"${G_PKGVERSION} \"" G_PKGVERSION_s="\"${G_PKGVERSION} \""
VER_CPPFLAGS= -DBUGURL=${G_BUGURL_s} \ VER_CPPFLAGS= -DBUGURL=${G_BUGURL_s} \
-DPKGVERSION=${G_PKGVERSION_s} \ -DPKGVERSION=${G_PKGVERSION_s} \
-DBASEVER="\"${BASEVER}"\" \ -DBASEVER="\"${BASEVER}"\" \
-DDATESTAMP="\"${DATESTAMP}"\" \ -DDATESTAMP=${DATESTAMPSTR} \
-DDEVPHASE=${DEVPHASE} \ -DDEVPHASE=${DEVPHASE} \
-DREVISION=${REVISION} -DREVISION=${REVISION}
CPPFLAGS.version.c= ${VER_CPPFLAGS} CPPFLAGS.version.c= ${VER_CPPFLAGS}