diff options
Diffstat (limited to 'gas')
-rw-r--r-- | gas/ChangeLog | 8 | ||||
-rw-r--r-- | gas/Makefile.in | 1 | ||||
-rwxr-xr-x | gas/configure | 13 | ||||
-rw-r--r-- | gas/configure.in | 10 | ||||
-rw-r--r-- | gas/doc/Makefile.am | 3 | ||||
-rw-r--r-- | gas/doc/Makefile.in | 4 | ||||
-rw-r--r-- | gas/doc/as.texinfo | 12 |
7 files changed, 42 insertions, 9 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index dde64e6..128f9e9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2007-03-07 Joseph Myers <joseph@codesourcery.com> + + * configure.in (REPORT_BUGS_TEXI): Define to Texinfo version of + bug-reporting URL. + * doc/Makefile.am (gasver.texi): Define BUGURL. + * doc/as.texinfo: Use BUGURL. + * Makefile.in, configure, doc/Makefile.in: Regenerate. + 2007-03-06 Andreas Krebbel <krebbel1@de.ibm.com> * config/tc-s390.c (md_parse_option): z9-ec option added. diff --git a/gas/Makefile.in b/gas/Makefile.in index 5bf93c0..847c108 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -182,6 +182,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@ REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\"" SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/gas/configure b/gas/configure index 66e027b..b7cd1e0 100755 --- a/gas/configure +++ b/gas/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL REPORT_BUGS_TO WARN_CFLAGS NO_WERROR GDBINIT cgen_cpu_prefix extra_objects target_cpu_type obj_format te_file install_tooldir atof OPCODES_LIB YACC LEX LEXLIB LEX_OUTPUT_ROOT USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT MKINSTALLDIRS MSGFMT MSGMERGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GENINSRC_NEVER_TRUE GENINSRC_NEVER_FALSE CPP EGREP ALLOCA LIBM datarootdir docdir htmldir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL REPORT_BUGS_TO REPORT_BUGS_TEXI WARN_CFLAGS NO_WERROR GDBINIT cgen_cpu_prefix extra_objects target_cpu_type obj_format te_file install_tooldir atof OPCODES_LIB YACC LEX LEXLIB LEX_OUTPUT_ROOT USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT MKINSTALLDIRS MSGFMT MSGMERGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GENINSRC_NEVER_TRUE GENINSRC_NEVER_FALSE CPP EGREP ALLOCA LIBM datarootdir docdir htmldir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4187,16 +4187,22 @@ if test "${with_bugurl+set}" = set; then yes) { { echo "$as_me:$LINENO: error: bug URL not specified" >&5 echo "$as_me: error: bug URL not specified" >&2;} { (exit 1); exit 1; }; } ;; - no) REPORT_BUGS_TO="" ;; - *) REPORT_BUGS_TO="<URL:$withval>" ;; + no) REPORT_BUGS_TO=""; + REPORT_BUGS_TEXI="" + ;; + *) REPORT_BUGS_TO="<URL:$withval>" + REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" + ;; esac else REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>" + REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}" fi; + GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes" # Check whether --enable-werror or --disable-werror was given. @@ -9628,6 +9634,7 @@ s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t +s,@REPORT_BUGS_TEXI@,$REPORT_BUGS_TEXI,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t s,@NO_WERROR@,$NO_WERROR,;t t s,@GDBINIT@,$GDBINIT,;t t diff --git a/gas/configure.in b/gas/configure.in index bcfb863..8af931d 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -46,12 +46,18 @@ AC_ARG_WITH(bugurl, [Direct users to URL to report a bug]), [case "$withval" in yes) AC_MSG_ERROR([bug URL not specified]) ;; - no) REPORT_BUGS_TO="" ;; - *) REPORT_BUGS_TO="<URL:$withval>" ;; + no) REPORT_BUGS_TO=""; + REPORT_BUGS_TEXI="" + ;; + *) REPORT_BUGS_TO="<URL:$withval>" + REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" + ;; esac], REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>" + REPORT_BUGS_TEXI="@uref{http://www.sourceware.org/bugzilla/}" ) AC_SUBST(REPORT_BUGS_TO) +AC_SUBST(REPORT_BUGS_TEXI) AM_BINUTILS_WARNINGS diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index 7590291..c830cb3 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -67,6 +67,9 @@ gasver.texi: $(srcdir)/../../bfd/configure rm -f $@ eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ echo "@set VERSION $$VERSION" > $@ + if [ -n "$(REPORT_BUGS_TEXI)" ]; then \ + echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> $@; \ + fi # We want install to imply install-info as per GNU standards, despite the # cygnus option. diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 17e0feb..2f1a7b1 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -137,6 +137,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ +REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@ REPORT_BUGS_TO = @REPORT_BUGS_TO@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -589,6 +590,9 @@ gasver.texi: $(srcdir)/../../bfd/configure rm -f $@ eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ echo "@set VERSION $$VERSION" > $@ + if [ -n "$(REPORT_BUGS_TEXI)" ]; then \ + echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> $@; \ + fi # We want install to imply install-info as per GNU standards, despite the # cygnus option. diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo index c846805..d14eef5 100644 --- a/gas/doc/as.texinfo +++ b/gas/doc/as.texinfo @@ -1,6 +1,6 @@ \input texinfo @c -*-Texinfo-*- @c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007 @c Free Software Foundation, Inc. @c UPDATE!! On future updates-- @c (1) check for new machine-dep cmdline options in @@ -100,7 +100,8 @@ END-INFO-DIR-ENTRY This file documents the GNU Assembler "@value{AS}". @c man begin COPYRIGHT -Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, 2006 Free Software Foundation, Inc. +Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, +2006, 2007 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -153,7 +154,8 @@ done. @end tex @vskip 0pt plus 1filll -Copyright @copyright{} 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, 2006 Free Software Foundation, Inc. +Copyright @copyright{} 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, +2006, 2007 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -6634,8 +6636,10 @@ You can find contact information for many support companies and individuals in the file @file{etc/SERVICE} in the @sc{gnu} Emacs distribution. +@ifset BUGURL In any event, we also recommend that you send bug reports for @command{@value{AS}} -to @samp{bug-binutils@@gnu.org}. +to @value{BUGURL}. +@end ifset The fundamental principle of reporting bugs usefully is this: @strong{report all the facts}. If you are not sure whether to state a |