update from main archive 960829

diff --git a/bare/Makefile b/bare/Makefile
index 588a713..5735153 100644 (file)
--- a/bare/Makefile
+++ b/bare/Makefile
@@ -48,7 +48,7 @@ $(objpfx)lib$(config-vendor).a: $(bare-routines:%=$(objpfx)%.o)
 # from scratch each time.
        rm -f $@
 ifdef objdir
 # from scratch each time.
        rm -f $@
 ifdef objdir

-       cd $(objdir); $(AR) cq$(verbose) $@ $(^:$(objpfx)%=%)
+       cd $(objpfx); $(AR) cq$(verbose) $(@:$(objpfx)%=%) $(^:$(objpfx)%=%)

 else
        $(AR) cq$(verbose) $@ $^
 endif
 else
        $(AR) cq$(verbose) $@ $^
 endif

diff --git a/catgets/gencat.c b/catgets/gencat.c
index e78fb0a..2e275fc 100644 (file)
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -212,7 +212,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -o, --output=NAME   write output to file NAME\n\
   -V, --version       output version information and exit\n\
 If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n\
   -o, --output=NAME   write output to file NAME\n\
   -V, --version       output version information and exit\n\
 If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n\

-is -, output is written to standard output.\n"),
+is -, output is written to standard output.\n\
+Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n"),

           program_invocation_name, program_invocation_name);
 
   exit (status);
           program_invocation_name, program_invocation_name);
 
   exit (status);

diff --git a/db/makedb.c b/db/makedb.c
index a215f25..d721595 100644 (file)
--- a/db/makedb.c
+++ b/db/makedb.c
@@ -207,7 +207,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       --quiet         don't print messages while building database\n\
   -u, --undo          print content of database file, one entry a line\n\
   -V, --version       output version information and exit\n\
       --quiet         don't print messages while building database\n\
   -u, --undo          print content of database file, one entry a line\n\
   -V, --version       output version information and exit\n\

-If INPUT-FILE is -, input is read from standard input.\n"),
+If INPUT-FILE is -, input is read from standard input.\n\
+Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n"),

            program_invocation_name, program_invocation_name,
            program_invocation_name);
 
            program_invocation_name, program_invocation_name,
            program_invocation_name);