From 066c2a57f5858310c9f12518317aecd4b54e753d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 1 Mar 2007 15:48:36 +0000 Subject: bfd: * Makefile.am (bfdver.h): Use "." not " " between version number and date. * Makefile.in: Regenerate. * configure.in (PKGVERSION): Default to "(GNU Binutils) ". * configure: Regenerate. binutils: * version.c (print_version): Update copyright date. gas: * as.c (parse_args): Update copyright date. gprof: * gprof.c: Include bfdver.h (main): Use BFD_VERSION_STRING for version number and package name. * Makefile.am (PKGVERSION): Remove. (INCLUDES): Update. Regenerate dependencies. * Makefile.in: Regenerate. * configure.in (PKGVERSION): Remove. * configure: Regenerate. ld: * ldver.c (ldversion): Remove word "version" from output. Update copyright date. --- bfd/ChangeLog | 8 ++++++++ bfd/Makefile.am | 2 +- bfd/Makefile.in | 2 +- bfd/configure | 2 +- bfd/configure.in | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d02f19a..a59681d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2007-03-01 Joseph Myers + + * Makefile.am (bfdver.h): Use "." not " " between version number + and date. + * Makefile.in: Regenerate. + * configure.in (PKGVERSION): Default to "(GNU Binutils) ". + * configure: Regenerate. + 2007-02-28 Nathan Sidwell * config.bfd (sh-*-uclinux, sh[12]-*-uclinux): New stanza. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 6644b7c..b474e8d 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -968,7 +968,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in bfd_version_package="\"$(PKGVERSION)\"" ;\ if test "x$(RELEASE)" = x ; then \ bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ - bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\ + bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ fi ;\ sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 1537c82..5ec2b59 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -1532,7 +1532,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in bfd_version_package="\"$(PKGVERSION)\"" ;\ if test "x$(RELEASE)" = x ; then \ bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ - bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\ + bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ fi ;\ sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@ diff --git a/bfd/configure b/bfd/configure index 460523d..00f6569 100755 --- a/bfd/configure +++ b/bfd/configure @@ -4399,7 +4399,7 @@ echo "$as_me: error: package version not specified" >&2;} *) PKGVERSION="($withval) " ;; esac else - PKGVERSION= + PKGVERSION="(GNU Binutils) " fi; diff --git a/bfd/configure.in b/bfd/configure.in index 0755226..9251e64 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -72,7 +72,7 @@ AC_ARG_WITH(pkgversion, no) PKGVERSION= ;; *) PKGVERSION="($withval) " ;; esac], - PKGVERSION= + PKGVERSION="(GNU Binutils) " ) AC_SUBST(PKGVERSION) -- cgit v1.1