[src/trunk]: src/external/gpl3/gcc/usr.bin fix version.c defines. now the ve...

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

details:   https://anonhg.NetBSD.org/src/rev/e0c0345d077e
branches:  trunk
changeset: 766754:e0c0345d077e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 01 10:03:17 2011 +0000

description:
fix version.c defines.  now the version says:
        gcc version 4.5.3 (NetBSD nb1 20110620)
instead of:
        gcc version 4.5.320110428

diffstat:

 external/gpl3/gcc/usr.bin/Makefile.inc |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 27bf6fe1698d -r e0c0345d077e external/gpl3/gcc/usr.bin/Makefile.inc
--- a/external/gpl3/gcc/usr.bin/Makefile.inc    Fri Jul 01 08:38:10 2011 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc    Fri Jul 01 10:03:17 2011 +0000
@@ -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>
 
@@ -31,7 +31,11 @@
 # XXX
 #DEVPHASE!=            cat ${GNUHOSTDIST}/gcc/DEV-PHASE
 DEVPHASE=
+.if ${DEVPHASE} == "release" || ${DEVPHASE} == ""
+DATESTAMP=
+.else
 DATESTAMP!=            cat ${GNUHOSTDIST}/gcc/DATESTAMP
+.endif
 
 BASEVERSTR=            "\"$(BASEVER)\""
 .if !empty(DEVPHASE)
@@ -39,7 +43,7 @@
 .else
 DEVPHASESTR=           "\"\""
 .endif
-.if !empty(DEVPHASE)
+.if !empty(DATESTAMP)
 DATESTAMPSTR=          "\" $(DATESTAMP)\""
 .else
 DATESTAMPSTR=          "\"\""
@@ -48,13 +52,13 @@
 # XXX pull this out of our configs
 G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html>
 G_BUGURL_s="\"${G_BUG_URL}\""
-G_PKGVERSION_s=(NetBSD nb1 20110620) 
+G_PKGVERSION=(NetBSD nb1 20110620) 
 G_PKGVERSION_s="\"${G_PKGVERSION} \""
 
 VER_CPPFLAGS=                  -DBUGURL=${G_BUGURL_s} \
                                -DPKGVERSION=${G_PKGVERSION_s} \
                                -DBASEVER="\"${BASEVER}"\" \
-                               -DDATESTAMP="\"${DATESTAMP}"\" \
+                               -DDATESTAMP=${DATESTAMPSTR} \
                                -DDEVPHASE=${DEVPHASE} \
                                -DREVISION=${REVISION}
 CPPFLAGS.version.c=            ${VER_CPPFLAGS}