* 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.
This commit is contained in:
Joseph Myers
2007-03-22 21:18:34 +00:00
parent 5200c3f3c1
commit e49e529d12
16 changed files with 100 additions and 29 deletions

View File

@ -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> 2003-03-22 H.J. Lu <hongjiu.lu@intel.com>
PR ld/4210 PR ld/4210

View File

@ -980,7 +980,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
-e "s,@report_bugs_to@,$$report_bugs_to," \ -e "s,@report_bugs_to@,$$report_bugs_to," \
< $(srcdir)/version.h > $@; \ < $(srcdir)/version.h > $@; \
echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \ 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; \ echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
if [ -n "$(REPORT_BUGS_TEXI)" ]; then \ if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \ echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \

View File

@ -958,15 +958,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
cd $(srcdir) && $(AUTOMAKE) --cygnus \ cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \ && exit 0; \
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ 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 .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
@ -1546,7 +1546,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
-e "s,@report_bugs_to@,$$report_bugs_to," \ -e "s,@report_bugs_to@,$$report_bugs_to," \
< $(srcdir)/version.h > $@; \ < $(srcdir)/version.h > $@; \
echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \ 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; \ echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
if [ -n "$(REPORT_BUGS_TEXI)" ]; then \ if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \ echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \

4
bfd/configure vendored
View File

@ -4417,12 +4417,12 @@ echo "$as_me: error: bug URL not specified" >&2;}
no) REPORT_BUGS_TO=""; no) REPORT_BUGS_TO="";
REPORT_BUGS_TEXI="" REPORT_BUGS_TEXI=""
;; ;;
*) REPORT_BUGS_TO="<URL:$withval>" *) REPORT_BUGS_TO="<$withval>"
REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
;; ;;
esac esac
else 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/}" REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
fi; fi;

View File

@ -85,11 +85,11 @@ AC_ARG_WITH(bugurl,
no) REPORT_BUGS_TO=""; no) REPORT_BUGS_TO="";
REPORT_BUGS_TEXI="" REPORT_BUGS_TEXI=""
;; ;;
*) REPORT_BUGS_TO="<URL:$withval>" *) REPORT_BUGS_TO="<$withval>"
REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}"
;; ;;
esac], 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/}" REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}"
) )
AC_SUBST(REPORT_BUGS_TO) AC_SUBST(REPORT_BUGS_TO)

View File

@ -340,9 +340,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ 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 .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \

View File

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

View File

@ -69,6 +69,9 @@ notice identical to this one except for the removal of this paragraph
@titlepage @titlepage
@finalout @finalout
@title The @sc{gnu} Binary Utilities @title The @sc{gnu} Binary Utilities
@ifset VERSION_PACKAGE
@subtitle @value{VERSION_PACKAGE}
@end ifset
@subtitle Version @value{VERSION} @subtitle Version @value{VERSION}
@sp 1 @sp 1
@subtitle @value{UPDATED} @subtitle @value{UPDATED}
@ -100,7 +103,11 @@ Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
@cindex version @cindex version
This brief manual contains documentation for the @sc{gnu} binary 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 @iftex
@table @code @table @code

View File

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

View File

@ -127,6 +127,10 @@ notice identical to this one except for the removal of this paragraph
@ifclear GENERIC @ifclear GENERIC
@subtitle for the @value{TARGET} family @subtitle for the @value{TARGET} family
@end ifclear @end ifclear
@ifset VERSION_PACKAGE
@sp 1
@subtitle @value{VERSION_PACKAGE}
@end ifset
@sp 1 @sp 1
@subtitle Version @value{VERSION} @subtitle Version @value{VERSION}
@sp 1 @sp 1
@ -170,8 +174,11 @@ Copyright @copyright{} 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002,
@node Top @node Top
@top Using @value{AS} @top Using @value{AS}
This file is a user guide to the @sc{gnu} assembler @command{@value{AS}} version This file is a user guide to the @sc{gnu} assembler @command{@value{AS}}
@value{VERSION}. @ifset VERSION_PACKAGE
@value{VERSION_PACKAGE}
@end ifset
version @value{VERSION}.
@ifclear GENERIC @ifclear GENERIC
This version of the file describes @command{@value{AS}} configured to generate This version of the file describes @command{@value{AS}} configured to generate
code for @value{TARGET} architectures. code for @value{TARGET} architectures.

View File

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

View File

@ -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 gprof_TEXINFOS = config.texi
man_MANS = gprof.1 man_MANS = gprof.1
AM_MAKEINFOFLAGS = -I "$(srcdir)" -I ../bfd/doc
TEXI2DVI = texi2dvi -I "$(srcdir)" -I ../bfd/doc
config.texi: config.texi:
echo "@set top_srcdir $(top_srcdir)" >> ./config.texi echo "@set top_srcdir $(top_srcdir)" >> ./config.texi

View File

@ -95,11 +95,6 @@ PDFS = gprof.pdf
PSS = gprof.ps PSS = gprof.ps
HTMLS = gprof.html HTMLS = gprof.html
TEXINFOS = gprof.texi 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 TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) 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) EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS)
POTFILES = $(sources) $(noinst_HEADERS) POTFILES = $(sources) $(noinst_HEADERS)
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
info_TEXINFOS = gprof.texi info_TEXINFOS = gprof.texi
gprof_TEXINFOS = config.texi gprof_TEXINFOS = config.texi
man_MANS = gprof.1 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|^.*/||'`; html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
MAINTAINERCLEANFILES = gprof.info MAINTAINERCLEANFILES = gprof.info
@ -282,15 +279,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
cd $(srcdir) && $(AUTOMAKE) --cygnus \ cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \ && exit 0; \
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ 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 .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \

View File

@ -5,6 +5,10 @@
@settitle GNU gprof @settitle GNU gprof
@setchapternewpage odd @setchapternewpage odd
@c man begin INCLUDE
@include bfdver.texi
@c man end
@ifinfo @ifinfo
@c This is a dir.info fragment to support semi-automated addition of @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. @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 @titlepage
@title GNU gprof @title GNU gprof
@subtitle The @sc{gnu} Profiler @subtitle The @sc{gnu} Profiler
@ifset VERSION_PACKAGE
@subtitle @value{VERSION_PACKAGE}
@end ifset
@subtitle Version @value{VERSION}
@author Jay Fenlason and Richard Stallman @author Jay Fenlason and Richard Stallman
@page @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 execution time. We assume that you know how to write, compile, and
execute programs. @sc{gnu} @code{gprof} was written by Jay Fenlason. 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 This document is distributed under the terms of the GNU Free
Documentation License. A copy of the license is included in the Documentation License. A copy of the license is included in the
section entitled ``GNU Free Documentation License''. section entitled ``GNU Free Documentation License''.

View File

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

View File

@ -61,7 +61,11 @@ END-INFO-DIR-ENTRY
@end ifinfo @end ifinfo
@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, Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 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 @titlepage
@title The GNU linker @title The GNU linker
@sp 1 @sp 1
@subtitle @code{ld} version 2 @subtitle @code{ld}
@ifset VERSION_PACKAGE
@subtitle @value{VERSION_PACKAGE}
@end ifset
@subtitle Version @value{VERSION} @subtitle Version @value{VERSION}
@author Steve Chamberlain @author Steve Chamberlain
@author Ian Lance Taylor @author Ian Lance Taylor
@ -125,7 +132,11 @@ section entitled ``GNU Free Documentation License''.
@ifnottex @ifnottex
@node Top @node Top
@top LD @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 This document is distributed under the terms of the GNU Free
Documentation License. A copy of the license is included in the Documentation License. A copy of the license is included in the