summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-09-23 00:24:55 +0000
committerUlrich Drepper <drepper@redhat.com>1996-09-23 00:24:55 +0000
commite320cbc913f2d70b3f68ba1005c02fb76adc4245 (patch)
tree322d23fcdd451a7aaad7bea9973401c19470784a /locale
parent7816fbdf7aec9e431535b2a23483ea746476443f (diff)
downloadglibc-e320cbc913f2d70b3f68ba1005c02fb76adc4245.tar.gz
glibc-e320cbc913f2d70b3f68ba1005c02fb76adc4245.tar.xz
glibc-e320cbc913f2d70b3f68ba1005c02fb76adc4245.zip
update from main archive 960922 cvs/libc-960923
Sun Sep 22 15:18:41 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/init-first.c: Define dummy function
 	`_dl_start' so that linking fails if this file should ever be used
 	in ld.so.

	* catgets/gencat.c (main): Change --version message according to
 	RMS' last standard revision.
	* db/makedb.c: Likewise.
	* locale/programs/locale.c: Likewise.
	* locale/programs/localedef.c: Likewise.

	(__get_nproc_conf): New function.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/locale.c10
-rw-r--r--locale/programs/localedef.c11
2 files changed, 18 insertions, 3 deletions
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index df11e1efdf..ea15c87638 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -183,7 +183,15 @@ main (int argc, char *argv[])
   /* Version information is requested.  */
   if (do_version)
     {
-      fprintf (stderr, "%s - GNU %s %s\n", __progname, PACKAGE, VERSION);
+      fprintf (stderr, "locale - GNU %s %s\n", PACKAGE, VERSION);
+      fprintf (stderr, _("\
+Copyright (C) %s Free Software Foundation, Inc.\n\
+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\
+"), "1995, 1996");
+      fprintf (stderr, _("Written by %s\n"),
+	       "Ulrich Drepper <drepper@cygnus.com>");
+
       exit (EXIT_SUCCESS);
     }
 
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 9df5d128de..1eae6e75d0 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -173,8 +173,15 @@ main (int argc, char *argv[])
   /* Version information is requested.  */
   if (do_version)
     {
-      fprintf (stderr, "%s - GNU %s %s\n", program_invocation_short_name,
-	       PACKAGE, VERSION);
+      fprintf (stderr, "localedef - GNU %s %s\n", PACKAGE, VERSION);
+      fprintf (stderr, _("\
+Copyright (C) %s Free Software Foundation, Inc.\n\
+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\
+"), "1995, 1996");
+      fprintf (stderr, _("Written by %s\n"),
+	       "Ulrich Drepper <drepper@cygnus.com>");
+
       exit (0);
     }