aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/Makefile.am4
-rw-r--r--bfd/Makefile.in12
-rwxr-xr-xbfd/configure4
-rw-r--r--bfd/configure.in4
-rw-r--r--bfd/doc/Makefile.in4
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/doc/binutils.texi9
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/doc/as.texinfo11
-rw-r--r--gprof/ChangeLog8
-rw-r--r--gprof/Makefile.am5
-rw-r--r--gprof/Makefile.in17
-rw-r--r--gprof/gprof.texi14
-rw-r--r--ld/ChangeLog4
-rw-r--r--ld/ld.texinfo17
16 files changed, 100 insertions, 29 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e05457a..d7b141b 100644
--- 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
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 5d2afb0..e579733 100644
--- 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; \
- 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; \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 8929b14..5eb55d5 100644
--- 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*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
- cd $(srcdir) && $(AUTOMAKE) --cygnus \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+ cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --cygnus Makefile
+ $(AUTOMAKE) --foreign Makefile
.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; \
- 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; \
diff --git a/bfd/configure b/bfd/configure
index efedc4b9..bb651a5 100755
--- 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=""
;;
- *) REPORT_BUGS_TO="<URL:$withval>"
+ *) REPORT_BUGS_TO="<$withval>"
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;
diff --git a/bfd/configure.in b/bfd/configure.in
index 1cd339b..bb7065b 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -85,11 +85,11 @@ AC_ARG_WITH(bugurl,
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_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)
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index 3a12d3b..0f41369 100644
--- 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; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --cygnus doc/Makefile
+ $(AUTOMAKE) --foreign doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 91b5fae..5b4830e 100644
--- 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
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index ec69742..c247593 100644
--- 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
+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
@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
-utilities (collectively version @value{VERSION}):
+utilities
+@ifset VERSION_PACKAGE
+@value{VERSION_PACKAGE}
+@end ifset
+version @value{VERSION}:
@iftex
@table @code
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5f9cbfd..93438cf 100644
--- 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
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index f5332ed..41c80a9 100644
--- 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
+@ifset VERSION_PACKAGE
+@sp 1
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
@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}
-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.
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 3fe1350..23c73ed 100644
--- 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.
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 3a3fb43..e439b1c 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -56,7 +56,7 @@ po/POTFILES.in: @MAINT@ Makefile
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
@@ -64,6 +64,9 @@ 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
+
config.texi:
echo "@set top_srcdir $(top_srcdir)" >> ./config.texi
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 8ed6219..f0b08f5 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -95,11 +95,6 @@ PDFS = gprof.pdf
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)
@@ -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
-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
+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
@@ -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*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
- cd $(srcdir) && $(AUTOMAKE) --cygnus \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+ cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --cygnus Makefile
+ $(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/gprof/gprof.texi b/gprof/gprof.texi
index beeddb6..064c460 100644
--- a/gprof/gprof.texi
+++ b/gprof/gprof.texi
@@ -5,6 +5,10 @@
@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.
@@ -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
+@ifset VERSION_PACKAGE
+@subtitle @value{VERSION_PACKAGE}
+@end ifset
+@subtitle Version @value{VERSION}
@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.
+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''.
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 16c45a5..1912285 100644
--- 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.
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index abcf5c0..9fd9c44 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -61,7 +61,11 @@ END-INFO-DIR-ENTRY
@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.
@@ -89,7 +93,10 @@ notice identical to this one except for the removal of this paragraph
@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
@@ -125,7 +132,11 @@ section entitled ``GNU Free Documentation License''.
@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
generated by cgit v1.1 at 2024-11-08 10:13:13 +0000