second update 960907 from main archive

Sun Sep  8 02:36:02 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/SYS_libc.c (_libc_intl_domainname): Change value to "libc".
	This is consistent with all other GNU packages.  We shouldn't
	take care for a possible clash.  Somebody will name the domain
	of a package libc if it is not the libc itself.
	* MakeTAGS ($P/SYS_libc.pot): Rename to $P/libc.pot.
	* po/Makefile (domainname): Change to libc.
	(distribute): Now ship libc.pot.
	* catgets/gencat.c (usage): Use `PACKAGE' for package name in
	version information banner.
	Change bug report address to bug-glibc@prep not @gnu.
	* db/makedb.c (PACKAGE): New macro.  Set to _libc_intl_domain.
	(main): Use `PACKAGE' for package name in version information
	banner.
	Change bug report address to bug-glibc@prep not @gnu.
	* locale/programs/locale.c (main): Use `PACKAGE' for package name
 	in version information banner.
	Change bug report address to bug-glibc@prep not @gnu.
	* locale/programs/localedef.c (main): Likewise.

	* version.h (VERSION): Bump to 1.94.

	* libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.

4 files changed, 6 insertions, 7 deletions

diff --git a/locale/Makefile b/locale/Makefile
index fd7425e71b..c212b2e71c 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -25,6 +25,7 @@ headers		= locale.h langinfo.h
 distribute	= localeinfo.h categories.def iso-4217.def weight.h \
 		  strlen-hash.h \
 		  $(addprefix programs/, \
+			      locale.c localedef.c \
 			      $(localedef-modules:=.c) $(locale-modules:=.c) \
 			      $(lib-modules:=.c) config.h simple-hash.h \
 			      charmap-kw.gperf charmap-kw.h locfile-token.h \
diff --git a/locale/SYS_libc.c b/locale/SYS_libc.c
index ed34903d22..53c9a6034e 100644
--- a/locale/SYS_libc.c
+++ b/locale/SYS_libc.c
@@ -1,6 +1,4 @@
 /* Define a constant for the dgettext domainname for libc internal messages,
    so the string constant is not repeated in dozens of object files.  */
 
-#include "../version.h"
-
-const char _libc_intl_domainname[] = "SYS_GNU_libc-" VERSION;
+const char _libc_intl_domainname[] = "libc";
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index a4254e3000..a3ffd48998 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
   /* Version information is requested.  */
   if (do_version)
     {
-      fprintf (stderr, "%s - GNU %s %s\n", __progname, "libc", VERSION);
+      fprintf (stderr, "%s - GNU %s %s\n", __progname, PACKAGE, VERSION);
       exit (EXIT_SUCCESS);
     }
 
@@ -245,7 +245,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
   -c, --category-name   write names of selected categories\n\
   -k, --keyword-name    write names of selected keywords\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>."),
+Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
 	    __progname);
 
   exit (status);
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index d47983b277..8eab9c1fa9 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
   if (do_version)
     {
       fprintf (stderr, "%s - GNU %s %s\n", program_invocation_short_name,
-	       "libc", VERSION);
+	       PACKAGE, VERSION);
       exit (0);
     }
 
@@ -397,7 +397,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 System's directory for character maps: %s\n\
                        locale files  : %s\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>."),
+Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
 	    program_invocation_name, CHARMAP_PATH, LOCALE_PATH);
 
   exit (status);