From e49e529d120e4bf2c93791900a41cf1a9e7e3cef Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 22 Mar 2007 21:18:34 +0000 Subject: 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. --- bfd/ChangeLog | 7 +++++++ bfd/Makefile.am | 4 +++- bfd/Makefile.in | 12 +++++++----- bfd/configure | 4 ++-- bfd/configure.in | 4 ++-- bfd/doc/Makefile.in | 4 ++-- 6 files changed, 23 insertions(+), 12 deletions(-) (limited to 'bfd') 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 + + * 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 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="" + *) REPORT_BUGS_TO="<$withval>" REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" ;; esac else - REPORT_BUGS_TO="" + REPORT_BUGS_TO="" 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="" + *) REPORT_BUGS_TO="<$withval>" REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" ;; esac], - REPORT_BUGS_TO="" + 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 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 \ -- cgit v1.1