system.h (GCCBUGURL): Delete.

	* system.h (GCCBUGURL): Delete.
	* version.c (bug_report_url): New.  Add commentary about
	modifying both these strings in modified distributions.
	* version.h: Declare bug_report_url.

	* diagnostic.c, gcc.c, gcov.c, java/gjavah.c, java/jcf-dump.c,
	java/jv-scan.c: Globally replace GCCBUGURL with bug_report_url.

From-SVN: r57932

gcc/ChangeLog

+2002-10-08  Zack Weinberg  <zack@codesourcery.com>
+
+	* system.h (GCCBUGURL): Delete.
+	* version.c (bug_report_url): New.  Add commentary about
+	modifying both these strings in modified distributions.
+	* version.h: Declare bug_report_url.
+
+	* diagnostic.c, gcc.c, gcov.c: Globally replace GCCBUGURL with
+	bug_report_url.
+
 2002-10-08  Nick Clifton  <nickc@redhat.com>
 
 	* config/rs6000/spe.h (__ev_set_acc_u64): Use __ev_create_u64 to

gcc/diagnostic.c

@@ -1194,7 +1194,7 @@ internal_error VPARAMS ((const char *msgid, ...))
   fnotice (stderr,
 "Please submit a full bug report,\n\
 with preprocessed source if appropriate.\n\
-See %s for instructions.\n", GCCBUGURL);
+See %s for instructions.\n", bug_report_url);
   exit (FATAL_EXIT_CODE);
 }
 
@@ -1302,7 +1302,7 @@ error_recursion (context)
   fnotice (stderr,
 "Please submit a full bug report,\n\
 with preprocessed source if appropriate.\n\
-See %s for instructions.\n", GCCBUGURL);
+See %s for instructions.\n", bug_report_url);
   exit (FATAL_EXIT_CODE);
 }
 

gcc/java/ChangeLog

+2002-10-08  Zack Weinberg  <zack@codesourcery.com>
+
+	* gjavah.c, jcf-dump.c, jv-scan.c: Globally replace GCCBUGURL with
+	bug_report_url.
+
 2002-10-08  Andrew Haley  <aph@redhat.com>
 
 	* parse.y (attach_init_test_initialization_flags): Check for

gcc/java/gjavah.c

@@ -2289,7 +2289,7 @@ help ()
   /* We omit -MG until it is implemented.  */
   printf ("\n");
   printf ("For bug reporting instructions, please see:\n");
-  printf ("%s.\n", GCCBUGURL);
+  printf ("%s.\n", bug_report_url);
   exit (0);
 }
 

gcc/java/jcf-dump.c

@@ -829,7 +829,7 @@ help ()
   printf ("  -v, --verbose           Print extra information while running\n");
   printf ("\n");
   printf ("For bug reporting instructions, please see:\n");
-  printf ("%s.\n", GCCBUGURL);
+  printf ("%s.\n", bug_report_url);
   exit (0);
 }
 

gcc/java/jv-scan.c

@@ -115,7 +115,7 @@ help ()
   printf ("  --version               Print version number, then exit\n");
   printf ("\n");
   printf ("For bug reporting instructions, please see:\n");
-  printf ("%s.\n", GCCBUGURL);
+  printf ("%s.\n", bug_report_url);
   exit (0);
 }
 

gcc/system.h

@@ -23,11 +23,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef GCC_SYSTEM_H
 #define GCC_SYSTEM_H
 
-/* This is the location of the online document giving information how
-   to report bugs. If you change this string, also check for strings
-   not under control of the preprocessor.  */
-#define GCCBUGURL "<URL:http://www.gnu.org/software/gcc/bugs.html>"
-
 /* We must include stdarg.h/varargs.h before stdio.h.  */
 #ifdef ANSI_PROTOTYPES
 #include <stdarg.h>

gcc/version.c

 #include "ansidecl.h"
 #include "version.h"
 
+/* This is the string reported as the version number by all components
+   of the compiler.  If you distribute a modified version of GCC,
+   please modify this string to indicate that, e.g. by putting your
+   organization's name in parentheses at the end of the string.  */
+
 const char version_string[] = "3.3 20021008 (experimental)";
+
+/* This is the location of the online document giving instructions for
+   reporting bugs.  If you distribute a modified version of GCC,
+   please change this to refer to a document giving instructions for
+   reporting bugs to you, not us.  (You are of course welcome to
+   forward us bugs reported to you, if you determine that they are
+   not bugs in your modifications.)  */
+
+const char bug_report_url[] = "<URL:http://www.gnu.org/software/gcc/bugs.html>";

gcc/version.h

 #ifndef GCC_VERSION_H
 #define GCC_VERSION_H
 extern const char version_string[];
+extern const char bug_report_url[];
 #endif /* ! GCC_VERSION_H */