diff -uNr icu/source/config/Makefile.inc.in icu-new/source/config/Makefile.inc.in
--- icu/source/config/Makefile.inc.in	Tue Jun  1 19:12:22 2004
+++ icu-new/source/config/Makefile.inc.in	Tue Jun 29 16:57:17 2004
@@ -48,7 +48,7 @@
 A = a
 
 # Suffix at the end of libraries. Usually empty.
-ICULIBSUFFIX = @ICULIBSUFFIX@
+ICULIBSUFFIX = .@ICULIBSUFFIX@
 # ICULIBSUFFIX_VERSION  is non-empty if it is to contain a library
 # version. For example, if it is 21, it means libraries are named
 # libicuuc21.so for example.
diff -uNr icu/source/config/mh-darwin icu-new/source/config/mh-darwin
--- icu/source/config/mh-darwin	Tue May 18 17:54:24 2004
+++ icu-new/source/config/mh-darwin	Tue Jun 29 16:59:48 2004
@@ -25,7 +25,7 @@
 SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
 
 ## Compiler switches to embed a library name and version information
-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
 
 ## Compiler switch to embed a runtime search path
 LD_RPATH=
@@ -36,6 +36,16 @@
 
 GENCCODE_ASSEMBLY=-a gcc-darwin
 
+## Override Versioned target for a shared library.
+FINAL_SO_TARGET=  $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
+MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
+
+# The following is for Makefile.inc's use.
+ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
+
+# this one is for icudefs.mk's use
+#SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
+
 ## Shared object suffix
 SO=		dylib
 ## Non-shared intermediate object suffix
@@ -72,9 +82,9 @@
 
 ## Versioned libraries rules
 
-%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
+%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO)
 	$(RM) $@ && ln -s ${<F} $@
-%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
+%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
+	$(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
 
 ## End Darwin-specific setup