bfd:

	* Makefile.am (bfdver.h): Only set VERSION_PACKAGE in bfdver.texi
	if nonempty.
	* configure.in (REPORT_BUGS_TO): Do not use "URL:" prefix.
	* Makefile.in, configure, doc/Makefile.in: Regenerate.

binutils:
	* doc/binutils.texi: Include VERSION_PACKAGE when reporting
	version.

gas:
	* doc/as.texinfo: Include VERSION_PACKAGE when reporting version.

gprof:
	* Makefile.am (TEXI2POD): Include $(AM_MAKEINFOFLAGS).
	(AM_MAKEINFOFLAGS, TEXI2DVI): Define with -I ../bfd/doc.
	* Makefile.in: Regenerate.
	* gprof.texi: Include bfdver.texi.  Report both VERSION_PACKAGE
	and VERSION.

ld:
	* ld.texinfo: Include VERSION_PACKAGE when reporting version.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e05457a7319843b5f13e35ace307863a12c57cca..d7b141b790d3718870156898e169b78ce5dc0dcc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+       * Makefile.am (bfdver.h): Only set VERSION_PACKAGE in bfdver.texi
+       if nonempty.
+       * configure.in (REPORT_BUGS_TO): Do not use "URL:" prefix.
+       * Makefile.in, configure, doc/Makefile.in: Regenerate.
+

 2003-03-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/4210
 2003-03-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/4210

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 5d2afb0a866ff19ea3cf34a9cfb4d668ac52fb03..e579733498e0f058903072f2675ade994dbaf6b7 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -980,7 +980,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
            -e "s,@report_bugs_to@,$$report_bugs_to," \
            < $(srcdir)/version.h > $@; \
         echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \
            -e "s,@report_bugs_to@,$$report_bugs_to," \
            < $(srcdir)/version.h > $@; \
         echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \

-        echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
+        if [ -n "$(PKGVERSION)" ]; then \
+          echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
+        fi; \

         echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
         if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
           echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \
         echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
         if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
           echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 8929b147aaa84d3aeb84be2d6ff956313f428b63..5eb55d52ed44ae64d4d4bf137b787d4abf1d41c6 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -958,15 +958,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \

-             echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
-             cd $(srcdir) && $(AUTOMAKE) --cygnus  \
+             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+             cd $(srcdir) && $(AUTOMAKE) --foreign  \

                && exit 0; \
              exit 1;; \
          esac; \
        done; \
                && exit 0; \
              exit 1;; \
          esac; \
        done; \

-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \

        cd $(top_srcdir) && \
        cd $(top_srcdir) && \

-         $(AUTOMAKE) --cygnus  Makefile
+         $(AUTOMAKE) --foreign  Makefile

 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \


@@ -1546,7 +1546,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
            -e "s,@report_bugs_to@,$$report_bugs_to," \
            < $(srcdir)/version.h > $@; \
         echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \
            -e "s,@report_bugs_to@,$$report_bugs_to," \
            < $(srcdir)/version.h > $@; \
         echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \

-        echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
+        if [ -n "$(PKGVERSION)" ]; then \
+          echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
+        fi; \

         echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
         if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
           echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \
         echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
         if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
           echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \

diff --git a/bfd/configure b/bfd/configure
index efedc4b9dfdbc0d32d0444f96b5fd404c35a2cc2..bb651a599a94c056dc4ff2e252bb22b9db99aa02 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -4417,12 +4417,12 @@ echo "$as_me: error: bug URL not specified" >&2;}
     no)  REPORT_BUGS_TO="";
         REPORT_BUGS_TEXI=""
         ;;
     no)  REPORT_BUGS_TO="";
         REPORT_BUGS_TEXI=""
         ;;

-    *)   REPORT_BUGS_TO="<URL:$withval>"
+    *)   REPORT_BUGS_TO="<$withval>"

         REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
         ;;
    esac
 else
         REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
         ;;
    esac
 else

-  REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
+  REPORT_BUGS_TO="<http://www.sourceware.org/bugzilla/>"

    REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
 
 fi;
    REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
 
 fi;

diff --git a/bfd/configure.in b/bfd/configure.in
index 1cd339bf1bd042d3a55f78837a9ee84e192551a8..bb7065bb2168d430c4f7f201f87a25f9017e6f3c 100644 (file)
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -85,11 +85,11 @@ AC_ARG_WITH(bugurl,
     no)  REPORT_BUGS_TO="";
         REPORT_BUGS_TEXI=""
         ;;
     no)  REPORT_BUGS_TO="";
         REPORT_BUGS_TEXI=""
         ;;

-    *)   REPORT_BUGS_TO="<URL:$withval>"
+    *)   REPORT_BUGS_TO="<$withval>"

         REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
         ;;
    esac],
         REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
         ;;
    esac],

-   REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
+   REPORT_BUGS_TO="<http://www.sourceware.org/bugzilla/>"

    REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
 )
 AC_SUBST(REPORT_BUGS_TO)
    REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
 )
 AC_SUBST(REPORT_BUGS_TO)

diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index 3a12d3bef2f52c5a8d2c5964ed3253de120d1e80..0f413696535f10ef2ff8a50076cfba28896c75e9 100644 (file)
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -340,9 +340,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
              exit 1;; \
          esac; \
        done; \
              exit 1;; \
          esac; \
        done; \

-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  doc/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \

        cd $(top_srcdir) && \
        cd $(top_srcdir) && \

-         $(AUTOMAKE) --cygnus  doc/Makefile
+         $(AUTOMAKE) --foreign  doc/Makefile

 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 91b5faefd0fe0daf3d0f5fc3280040a4196ef23a..5b4830ee1e43c41eabe370759cca7208a429b792 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+       * doc/binutils.texi: Include VERSION_PACKAGE when reporting
+       version.
+

 2007-03-16  Kai Tietz  <Kai.Tietz@onevision.com>
 
        * dlltool.c (make_one_lib_file): Use pc-relative relocation
 2007-03-16  Kai Tietz  <Kai.Tietz@onevision.com>
 
        * dlltool.c (make_one_lib_file): Use pc-relative relocation

diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index ec6974204e5f5618ff833f7d05135f2229f74c94..c247593486041cec4028f30790233d794cf0caa6 100644 (file)
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -69,6 +69,9 @@ notice identical to this one except for the removal of this paragraph
 @titlepage
 @finalout
 @title The @sc{gnu} Binary Utilities
 @titlepage
 @finalout
 @title The @sc{gnu} Binary Utilities

+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset

 @subtitle Version @value{VERSION}
 @sp 1
 @subtitle @value{UPDATED}
 @subtitle Version @value{VERSION}
 @sp 1
 @subtitle @value{UPDATED}


@@ -100,7 +103,11 @@ Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 
 @cindex version
 This brief manual contains documentation for the @sc{gnu} binary
 
 @cindex version
 This brief manual contains documentation for the @sc{gnu} binary

-utilities (collectively version @value{VERSION}): 
+utilities
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}:

 
 @iftex
 @table @code
 
 @iftex
 @table @code

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5f9cbfd16f51b7bcb5adcb920f2a2c94775c9e4e..93438cf52e1bf6450bfb77ef47e0040c08cdef75 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+       * doc/as.texinfo: Include VERSION_PACKAGE when reporting version.
+

 2003-03-21  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (process_suffix): Check 0x90 instead of
 2003-03-21  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (process_suffix): Check 0x90 instead of

diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index f5332ed7dbd882225e9bca8e792620e98abcfdcb..41c80a9a8124324acf430a9be9760831b418e3da 100644 (file)
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -127,6 +127,10 @@ notice identical to this one except for the removal of this paragraph
 @ifclear GENERIC
 @subtitle for the @value{TARGET} family
 @end ifclear
 @ifclear GENERIC
 @subtitle for the @value{TARGET} family
 @end ifclear

+@ifset VERSION_PACKAGE
+@sp 1
+@subtitle @value{VERSION_PACKAGE}
+@end ifset

 @sp 1
 @subtitle Version @value{VERSION}
 @sp 1
 @sp 1
 @subtitle Version @value{VERSION}
 @sp 1


@@ -170,8 +174,11 @@ Copyright @copyright{} 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002,
 @node Top
 @top Using @value{AS}
 
 @node Top
 @top Using @value{AS}
 

-This file is a user guide to the @sc{gnu} assembler @command{@value{AS}} version
-@value{VERSION}.
+This file is a user guide to the @sc{gnu} assembler @command{@value{AS}}
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.

 @ifclear GENERIC
 This version of the file describes @command{@value{AS}} configured to generate
 code for @value{TARGET} architectures.
 @ifclear GENERIC
 This version of the file describes @command{@value{AS}} configured to generate
 code for @value{TARGET} architectures.

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 3fe1350c13145be799865a7b0cc2f59ea9ac5b59..23c73edb596fa6734d7f9bfa303bfdeb4db2c6b1 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+       * Makefile.am (TEXI2POD): Include $(AM_MAKEINFOFLAGS).
+       (AM_MAKEINFOFLAGS, TEXI2DVI): Define with -I ../bfd/doc.
+       * Makefile.in: Regenerate.
+       * gprof.texi: Include bfdver.texi.  Report both VERSION_PACKAGE
+       and VERSION.
+

 2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * Makefile.am (REPORT_BUGS_TO): Removed.
 2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * Makefile.am (REPORT_BUGS_TO): Removed.

diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 3a3fb43eba2ae31f5f58a835c33612849582aa14..e439b1cc291913a9ab1e7710e2c8bd7b820a0df7 100644 (file)
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -56,7 +56,7 @@ po/POTFILES.in: @MAINT@ Makefile
 
 MANCONF  = -Dman
 
 
 MANCONF  = -Dman
 

-TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl
+TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS)

 
 POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
 
 
 POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
 


@@ -64,6 +64,9 @@ info_TEXINFOS = gprof.texi
 gprof_TEXINFOS = config.texi
 man_MANS = gprof.1
 
 gprof_TEXINFOS = config.texi
 man_MANS = gprof.1
 

+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I ../bfd/doc
+TEXI2DVI = texi2dvi -I "$(srcdir)" -I ../bfd/doc
+

 config.texi:
        echo "@set top_srcdir $(top_srcdir)" >> ./config.texi
 
 config.texi:
        echo "@set top_srcdir $(top_srcdir)" >> ./config.texi
 

diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 8ed62190aa7c9ea900ea0d9b6c2cbb580cd5103b..f0b08f597f5e897c1dafb03abe0372aef1636bec 100644 (file)
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -95,11 +95,6 @@ PDFS = gprof.pdf
 PSS = gprof.ps
 HTMLS = gprof.html
 TEXINFOS = gprof.texi
 PSS = gprof.ps
 HTMLS = gprof.html
 TEXINFOS = gprof.texi

-TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \
-             echo $(top_srcdir)/../texinfo/util/texi2dvi; \
-           else \
-             echo texi2dvi; \
-           fi`

 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)


@@ -258,11 +253,13 @@ BUILT_SOURCES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
 EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS)
 POTFILES = $(sources) $(noinst_HEADERS)
 MANCONF = -Dman
 EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS)
 POTFILES = $(sources) $(noinst_HEADERS)
 MANCONF = -Dman

-TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl
+TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS)

 POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
 info_TEXINFOS = gprof.texi
 gprof_TEXINFOS = config.texi
 man_MANS = gprof.1
 POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
 info_TEXINFOS = gprof.texi
 gprof_TEXINFOS = config.texi
 man_MANS = gprof.1

+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I ../bfd/doc
+TEXI2DVI = texi2dvi -I "$(srcdir)" -I ../bfd/doc

 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
 MAINTAINERCLEANFILES = gprof.info
 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
 MAINTAINERCLEANFILES = gprof.info


@@ -282,15 +279,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \

-             echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
-             cd $(srcdir) && $(AUTOMAKE) --cygnus  \
+             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+             cd $(srcdir) && $(AUTOMAKE) --foreign  \

                && exit 0; \
              exit 1;; \
          esac; \
        done; \
                && exit 0; \
              exit 1;; \
          esac; \
        done; \

-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \

        cd $(top_srcdir) && \
        cd $(top_srcdir) && \

-         $(AUTOMAKE) --cygnus  Makefile
+         $(AUTOMAKE) --foreign  Makefile

 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/gprof/gprof.texi b/gprof/gprof.texi
index beeddb6611b15ec76f6decb1b18aa6a871e127d2..064c460c1b4b8db9358f82a5772ed8eca98b5ae7 100644 (file)
--- a/gprof/gprof.texi
+++ b/gprof/gprof.texi
@@ -5,6 +5,10 @@
 @settitle GNU gprof
 @setchapternewpage odd
 
 @settitle GNU gprof
 @setchapternewpage odd
 

+@c man begin INCLUDE
+@include bfdver.texi
+@c man end
+

 @ifinfo
 @c This is a dir.info fragment to support semi-automated addition of
 @c manuals to an info tree.  zoo@cygnus.com is developing this facility.
 @ifinfo
 @c This is a dir.info fragment to support semi-automated addition of
 @c manuals to an info tree.  zoo@cygnus.com is developing this facility.


@@ -45,6 +49,10 @@ notice identical to this one except for the removal of this paragraph
 @titlepage
 @title GNU gprof
 @subtitle The @sc{gnu} Profiler 
 @titlepage
 @title GNU gprof
 @subtitle The @sc{gnu} Profiler 

+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
+@subtitle Version @value{VERSION}

 @author Jay Fenlason and Richard Stallman
 
 @page
 @author Jay Fenlason and Richard Stallman
 
 @page


@@ -76,6 +84,12 @@ can use it to determine which parts of a program are taking most of the
 execution time.  We assume that you know how to write, compile, and
 execute programs.  @sc{gnu} @code{gprof} was written by Jay Fenlason.
 
 execution time.  We assume that you know how to write, compile, and
 execute programs.  @sc{gnu} @code{gprof} was written by Jay Fenlason.
 

+This manual is for @code{gprof}
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.
+

 This document is distributed under the terms of the GNU Free
 Documentation License.  A copy of the license is included in the
 section entitled ``GNU Free Documentation License''.
 This document is distributed under the terms of the GNU Free
 Documentation License.  A copy of the license is included in the
 section entitled ``GNU Free Documentation License''.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 16c45a5ecef6fe33715ef65b5db904cccc55e4ab..1912285544531f8333fb655f622f8e479608dce9 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+       * ld.texinfo: Include VERSION_PACKAGE when reporting version.
+

 2007-03-20  Paul Brook  <paul@codesourcery.com>
 
        * emultempl/armelf.em (pic_veneer): New variable.
 2007-03-20  Paul Brook  <paul@codesourcery.com>
 
        * emultempl/armelf.em (pic_veneer): New variable.

diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index abcf5c0b0114d5e3dc470ec4790c7ae3dd6e4b93..9fd9c442d9cd258beed793b30347b545c9271563 100644 (file)
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -61,7 +61,11 @@ END-INFO-DIR-ENTRY
 @end ifinfo
 
 @ifinfo
 @end ifinfo
 
 @ifinfo

-This file documents the @sc{gnu} linker LD version @value{VERSION}.
+This file documents the @sc{gnu} linker LD
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.

 
 Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000,
 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000,
 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.


@@ -89,7 +93,10 @@ notice identical to this one except for the removal of this paragraph
 @titlepage
 @title The GNU linker
 @sp 1
 @titlepage
 @title The GNU linker
 @sp 1

-@subtitle @code{ld} version 2
+@subtitle @code{ld}
+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset

 @subtitle Version @value{VERSION}
 @author Steve Chamberlain
 @author Ian Lance Taylor
 @subtitle Version @value{VERSION}
 @author Steve Chamberlain
 @author Ian Lance Taylor


@@ -125,7 +132,11 @@ section entitled ``GNU Free Documentation License''.
 @ifnottex
 @node Top
 @top LD
 @ifnottex
 @node Top
 @top LD

-This file documents the @sc{gnu} linker ld version @value{VERSION}.
+This file documents the @sc{gnu} linker ld
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}.

 
 This document is distributed under the terms of the GNU Free
 Documentation License.  A copy of the license is included in the
 
 This document is distributed under the terms of the GNU Free
 Documentation License.  A copy of the license is included in the