gcc.c (process_command): Allow translation of the copyright symbol but not the rest...

gcc/
	* gcc.c (process_command): Allow translation of the copyright
	symbol but not the rest of the copyright message.
	* gcov.c (print_version): Likewise.  Allow translation of the
	message about warranty.

gcc/f/
	* Make-lang.in (g77spec.o): Depend on intl.h.
	* g77spec.c: Include intl.h.
	(lang_specific_driver): Allow translation of the copyright
	symbol but not the rest of the copyright message.  Allow
	translation of the message about warranty.

From-SVN: r78152

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cdefdbae93bb894cdb27bdce452a273e27eb163c..205f9d989869a45ddeb1dccda9f21ee88cfd085d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-20  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * gcc.c (process_command): Allow translation of the copyright
+       symbol but not the rest of the copyright message.
+       * gcov.c (print_version): Likewise.  Allow translation of the
+       message about warranty.
+
 2004-02-20  Hans-Peter Nilsson  <hp@axis.com>
 
        * config/cris/cris.md ("*andsi_movu"): Correct parentheses in

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 0dd169a080ebdd7cd3c9320590774c99dd123d2a..10a93ac36bcdc557736420c761e10bcc8dd53fde 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-20  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * Make-lang.in (g77spec.o): Depend on intl.h.
+       * g77spec.c: Include intl.h.
+       (lang_specific_driver): Allow translation of the copyright
+       symbol but not the rest of the copyright message.  Allow
+       translation of the message about warranty.
+
 2004-02-19  Matt Kraai  <kraai@alumni.cmu.edu>
 
        * Make-lang.in (f/stamp-1t, f/stamp-2t, f/stamp-fo)

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 5131a577a929f2c78fed803f0dd2b91ce330b8ce..04e46c710c25f9171c9e9278c8d91f2c6f5169d4 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -64,7 +64,7 @@ F77 f77: f771$(exeext)
   f77.stageprofile f77.stagefeedback
 
 g77spec.o: $(srcdir)/f/g77spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \
-       $(CONFIG_H)
+       $(CONFIG_H) intl.h
        (SHLIB_LINK='$(SHLIB_LINK)' \
        SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
        $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \

diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index b5404994c2d72e3946fae2a53b195f38b44d3b3c..3dca7bc44838d114b2d1543f362196425b87565f 100644 (file)
--- a/gcc/f/g77spec.c
+++ b/gcc/f/g77spec.c
@@ -1,5 +1,5 @@
 /* Specific flags and argument handling of the Fortran front-end.
-   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -50,6 +50,7 @@ Boston, MA 02111-1307, USA.  */
 #include "coretypes.h"
 #include "tm.h"
 #include "gcc.h"
+#include "intl.h"
 
 #ifndef MATH_LIBRARY
 #define MATH_LIBRARY "-lm"
@@ -345,16 +346,17 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
          break;
 
        case OPTION_version:
-         printf ("\
-GNU Fortran (GCC) %s\n\
-Copyright (C) 2002 Free Software Foundation, Inc.\n\
-\n\
+         printf ("GNU Fortran (GCC) %s\n", version_string);
+         printf ("Copyright %s 2004 Free Software Foundation, Inc.\n",
+                 _("(C)"));
+         printf ("\n");
+         printf (_("\
 GNU Fortran comes with NO WARRANTY, to the extent permitted by law.\n\
 You may redistribute copies of GNU Fortran\n\
 under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING\n\
 or type the command `info -f g77 Copying'.\n\
-", version_string);
+"));
          exit (0);
          break;
 

diff --git a/gcc/gcc.c b/gcc/gcc.c
index ebefeb876abf906578b6a3ac315e58136701b282..e4cce369a9c087d1f72a8b890d36a936f96bf66a 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -3349,8 +3349,8 @@ process_command (int argc, const char *const *argv)
        {
          /* translate_options () has turned --version into -fversion.  */
          printf (_("%s (GCC) %s\n"), programname, version_string);
-         fputs ("Copyright (C) 2004 Free Software Foundation, Inc.\n",
-                stdout);
+         printf ("Copyright %s 2004 Free Software Foundation, Inc.\n",
+                 _("(C)"));
          fputs (_("This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
                 stdout);

diff --git a/gcc/gcov.c b/gcc/gcov.c
index f95334a4319fcc2a287b80d6febad360794d344e..172f9e85651fd39495661b3d9733fb0444cba633 100644 (file)
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -1,7 +1,7 @@
 /* Gcov.c: prepend line execution counts and branch probabilities to a
    source file.
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by James E. Wilson of Cygnus Support.
    Mangled by Bob Manson of Cygnus Support.
    Mangled further by Nathan Sidwell <nathan@codesourcery.com>
@@ -420,11 +420,12 @@ static void
 print_version (void)
 {
   fnotice (stdout, "gcov (GCC) %s\n", version_string);
-  fnotice (stdout, "Copyright (C) 2003 Free Software Foundation, Inc.\n");
+  fprintf (stdout, "Copyright %s 2004 Free Software Foundation, Inc.\n",
+          _("(C)"));
   fnotice (stdout,
-          "This is free software; see the source for copying conditions.\n"
-          "There is NO warranty; not even for MERCHANTABILITY or \n"
-          "FITNESS FOR A PARTICULAR PURPOSE.\n\n");
+          _("This is free software; see the source for copying conditions.\n"
+            "There is NO warranty; not even for MERCHANTABILITY or \n"
+            "FITNESS FOR A PARTICULAR PURPOSE.\n\n"));
   exit (SUCCESS_EXIT_CODE);
 }