t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely within the multilib directory.

2004-11-15  Mark Mitchell <mark@codesourcery.com>

	* config/t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely
	within the multilib directory.

From-SVN: r90669

gcc/ChangeLog

+2004-11-15  Mark Mitchell <mark@codesourcery.com>
+
+	* config/t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely
+	within the multilib directory.
+
 2004-11-15  Nick Clifton  <nickc@redhat.com>
 
 	* config/stormy16/stormy16.h (TARGET_CPU_CPP_BUILTINS): Add

gcc/config/t-slibgcc-sld

@@ -12,12 +12,12 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
 	-Wl,-h,$(SHLIB_SONAME) -Wl,-z,text -Wl,-z,defs \
 	-Wl,-M,$(SHLIB_MAP) -o $(SHLIB_NAME).tmp \
 	@multilib_flags@ $(SHLIB_OBJS) -lc && \
-	rm -f $(SHLIB_SOLINK) && \
+	rm -f @shlib_dir@$(SHLIB_SOLINK) && \
 	if [ -f $(SHLIB_NAME) ]; then \
 	  mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
 	else true; fi && \
 	mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
-	$(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
+	$(LN_S) $(SHLIB_SONAME) @shlib_dir@$(SHLIB_SOLINK)
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
 SHLIB_INSTALL = \