update from main archive 960907

diff --git a/Makefile b/Makefile
index 039e3c9..014b581 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -129,6 +129,23 @@ $(objpfx)sysd-dirs: $(+sysdir_pfx)config.make
         echo endef) > $@-tmp
         mv -f $@-tmp $@
 \f
+$(objpfx)version-info.h: $(..)Makefile $(+sysdir_pfx)config.make
+       (first=yes;                                                           \
+        for dir in $(subdirs); do                                            \
+          if [ -r $$dir/Banner ]; then                                       \
+            if [ $$first = yes ]; then                                       \
+              echo "\"Available extensions:";                                \
+              first=no;                                                      \
+            fi;                                                              \
+            sed -e '/^#/d' -e 's/^[[:space:]]*/        /' $$dir/Banner;    \
+          fi;                                                                \
+        done;                                                                \
+        [ $first = yes ] || echo "\"") > $@-tmp
+        mv -f $@-tmp $@
+
+version.c-objects := $(addprefix $(objpfx)version,$(object-suffixes))
+$(version.c-objects): $(objpfx)version-info.h
+\f
 # Makerules creates a file `stub-$(subdir)' for each subdirectory, which
 # contains `#define __stub_FUNCTION' for each function which is a stub.
 # Here we paste all of these together into <stubs.h>.

diff --git a/Makerules b/Makerules
index 441e24c..740cc0f 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -643,6 +643,7 @@ object-suffixes-left := $(versioned)
 include $(o-iterator)
 
 
+ifeq (,$($(subdir)-version))
 define o-iterator-doit
 $(libdir)/$o$($o-version): $(libdir)/$(o:.so=)-$(version).so; $$(make-link)
 endef
@@ -654,6 +655,21 @@ $(libdir)/$(o:.so=)-$(version).so: $(objpfx)$o; $$(do-install-program)
 endef
 object-suffixes-left := $(versioned)
 include $(o-iterator)
+else
+define o-iterator-doit
+$(libdir)/$o$($o-version): $(libdir)/$(o:.so=)-$($(subdir)-version).so;
+       $$(make-link)
+endef
+object-suffixes-left := $(versioned)
+include $(o-iterator)
+
+define o-iterator-doit
+$(libdir)/$(o:.so=)-$($(subdir)-version).so: $(objpfx)$o;
+       $$(do-install-program)
+endef
+object-suffixes-left := $(versioned)
+include $(o-iterator)
+endif
 endif
 
 define do-install-so

diff --git a/catgets/catgets.c b/catgets/catgets.c
index eae962f..0abc182 100644 (file)
--- a/catgets/catgets.c
+++ b/catgets/catgets.c
@@ -34,7 +34,7 @@ catopen (const char *cat_name, int flag)
   __nl_catd result;
   const char *env_var;
 
-  result = (__nl_catd) malloc (sizeof (__nl_catd));
+  result = (__nl_catd) malloc (sizeof (*result));
   if (result == NULL)
     /* We cannot get enough memory.  */
     return (nl_catd) -1;

diff --git a/version.c b/version.c
index c8f4ec5..a001398 100644 (file)
--- a/version.c
+++ b/version.c
@@ -26,8 +26,9 @@ Compiled by GNU CC version "__VERSION__".\n\
 Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
-PARTICULAR PURPOSE.\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n";
+PARTICULAR PURPOSE.\n"
+#include "version-info.h"
+"Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n";
 
 #include <unistd.h>