* Makerules (build-shlib): Use $(@F:lib%.so=%) in place of

	$(notdir $*), so it wins for the explicit libc.so rule as well as the
	pattern rule.

diff --git a/ChangeLog b/ChangeLog
index 3301ea1..1e510a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 Thu Sep 21 00:03:53 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
-       * Makerules (build-shlib): Use $(@F:lib%=%) in place of $(notdir $*),
-       so it wins for the explicit libc.so rule as well as the pattern rule.
+       * Makerules (build-shlib): Use $(@F:lib%.so=%) in place of
+       $(notdir $*), so it wins for the explicit libc.so rule as well as the
+       pattern rule. 
 
        * sysdeps/stub/sys/sem_buf.h (union semun): New type.
 

diff --git a/Makerules b/Makerules
index 04c4387..1899eb7 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -554,10 +554,10 @@ lib%.so: lib%_pic.a; $(build-shlib)
 
 define build-shlib
 $(LINK.o) -shared -o $@ -Wl,-soname \
-         -Wl,lib$(libprefix)$(@F:lib%=%).so$($(@F)-version) \
-         $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%=%).so) \
+         -Wl,lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \
+         $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \
          -L$(firstword $(objdir) .)  -L$(common-objpfx:%/=%) \
-         -Wl,--whole-archive $^ $(LDLIBS-$(@F:lib%=%).so)
+         -Wl,--whole-archive $^ $(LDLIBS-$(@F:lib%.so=%).so)
 endef
 
 # Don't try to use -lc when making libc.so itself.