Fix all-liblinks when symlinks are unsupported

After building libraries, we make links to a central directory so that
programs and other libraries can be built against them.  These links
were changed from symlinks to hard links by commit
24311fa2b4b95597695560144313debe0211e968, and were reverted to
symlinks by commit 6e0bfbc787509dbaac4947a76e07a2bd6ba7956d.

As part of the first commit, the links to .so and .so.X were made
within the central directory instead of directly to the library build
directory.  However, the dependencies were not updated to ensure that
the link target is created before the link, so when $(LN_S) is "cp
-pR" and not "ln -s", the build steps could be executed out of order
and fail.  This part of the first commit was not reverted in the
second commit.  Revert it now so that the dependencies match the
links.

ticket: 8976

diff --git a/src/config/lib.in b/src/config/lib.in
index 882e60267ae53226b91477ce0709b0db74906d31..774e120a0d54d2a09c310f9bb46e098a61300d2c 100644 (file)
--- a/src/config/lib.in
+++ b/src/config/lib.in
@@ -98,12 +98,10 @@ $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT)
        (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .)
 $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT): lib$(LIBBASE)$(SHLIBEXT)
        $(RM) $@
-       (cd $(TOPLIBD) && \
-        $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) lib$(LIBBASE)$(SHLIBEXT))
+       (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBEXT) .)
 $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT): lib$(LIBBASE)$(SHLIBSEXT)
        $(RM) $@
-       (cd $(TOPLIBD) && \
-        $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) lib$(LIBBASE)$(SHLIBSEXT))
+       (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBSEXT) .)
 $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT): lib$(LIBBASE)$(SHLIBVEXT)
        $(RM) $@
        (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBVEXT) .)