diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix
index 3129274d389..92ed11459d1 100644
--- a/icu4c/source/config/mh-aix
+++ b/icu4c/source/config/mh-aix
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-aix,v 1.35 2003/12/18 23:14:11 emader-oss Exp $
+## $Id: mh-aix,v 1.36 2004/03/26 22:33:12 grhoten-oss Exp $
 ##
 ## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). 
 ## So, we are using 'windows' style library names, that is, libicuuc20.1.so instead of libicuuc.so.20.1
@@ -102,9 +102,9 @@ STATIC_O = o
 
 ## Versioned libraries rules
 %$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+	$(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 %.$(SO): %$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+	$(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 
 
 ## BIR  - bind with internal references [so app data and icu data doesn't collide]
diff --git a/icu4c/source/config/mh-aix-gcc b/icu4c/source/config/mh-aix-gcc
index c27c1cdd1de..3b19f0509da 100644
--- a/icu4c/source/config/mh-aix-gcc
+++ b/icu4c/source/config/mh-aix-gcc
@@ -97,9 +97,9 @@ STATIC_O = o
 
 ## Versioned libraries rules
 %$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+	$(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 %.$(SO): %$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+	$(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 
 
 ## BIR  - bind with internal references [so app data and icu data doesn't collide]
diff --git a/icu4c/source/config/mh-aix-va b/icu4c/source/config/mh-aix-va
index 9b195b9db00..50b8d3967a1 100644
--- a/icu4c/source/config/mh-aix-va
+++ b/icu4c/source/config/mh-aix-va
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-aix-va,v 1.32 2004/03/10 18:28:14 grhoten-oss Exp $
+## $Id: mh-aix-va,v 1.33 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Commands to generate dependency files
 GEN_DEPS.c=	$(CC) -E -M $(DEFS) $(CPPFLAGS)
@@ -104,8 +104,8 @@ STATIC_O = o
 
 ## Versioned libraries rules
 %$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+	$(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 %.$(SO): %$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+	$(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 
 ## End Aix-specific setup
diff --git a/icu4c/source/config/mh-alpha-linux-cc b/icu4c/source/config/mh-alpha-linux-cc
index 8e904d07652..b2b16528596 100644
--- a/icu4c/source/config/mh-alpha-linux-cc
+++ b/icu4c/source/config/mh-alpha-linux-cc
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-alpha-linux-cc,v 1.10 2004/03/26 18:07:35 grhoten-oss Exp $
+## $Id: mh-alpha-linux-cc,v 1.11 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Commands to generate dependency files
 #GEN_DEPS.c=	$(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet
@@ -74,9 +74,9 @@ STATIC_O = ao
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ##  Bind internal references
 
diff --git a/icu4c/source/config/mh-alpha-linux-gcc b/icu4c/source/config/mh-alpha-linux-gcc
index f8d63242be0..5648c5c162f 100644
--- a/icu4c/source/config/mh-alpha-linux-gcc
+++ b/icu4c/source/config/mh-alpha-linux-gcc
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-alpha-linux-gcc,v 1.9 2004/03/26 18:07:35 grhoten-oss Exp $
+## $Id: mh-alpha-linux-gcc,v 1.10 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Commands to generate dependency files
 GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
@@ -62,9 +62,9 @@ STATIC_O = ao
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ##  Bind internal references
 
diff --git a/icu4c/source/config/mh-alpha-osf b/icu4c/source/config/mh-alpha-osf
index 53d26830c12..9f913a3a107 100644
--- a/icu4c/source/config/mh-alpha-osf
+++ b/icu4c/source/config/mh-alpha-osf
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-alpha-osf,v 1.6 2004/03/26 18:07:35 grhoten-oss Exp $
+## $Id: mh-alpha-osf,v 1.7 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Commands to generate dependency files
 #GEN_DEPS.c=	$(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet
@@ -74,9 +74,9 @@ STATIC_O = ao
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ##  Bind internal references
 
diff --git a/icu4c/source/config/mh-bsd-gcc b/icu4c/source/config/mh-bsd-gcc
index f04181ace84..254ec52a7f1 100644
--- a/icu4c/source/config/mh-bsd-gcc
+++ b/icu4c/source/config/mh-bsd-gcc
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-bsd-gcc,v 1.9 2004/03/26 18:07:35 grhoten-oss Exp $
+## $Id: mh-bsd-gcc,v 1.10 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Commands to generate dependency files
 GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
@@ -54,9 +54,9 @@ STATIC_O = ao
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ## End FreeBSD-specific setup
 
diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin
index 310a6b5a583..a68101676dd 100644
--- a/icu4c/source/config/mh-darwin
+++ b/icu4c/source/config/mh-darwin
@@ -4,7 +4,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-darwin,v 1.32 2004/03/26 18:07:35 grhoten-oss Exp $
+## $Id: mh-darwin,v 1.33 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Flags for position independent code
 SHAREDLIBCFLAGS = -dynamic
@@ -75,8 +75,8 @@ STATIC_O = ao
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ## End Darwin-specific setup
diff --git a/icu4c/source/config/mh-hpux-acc b/icu4c/source/config/mh-hpux-acc
index 4d6e5150b0d..81ef0935063 100644
--- a/icu4c/source/config/mh-hpux-acc
+++ b/icu4c/source/config/mh-hpux-acc
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-hpux-acc,v 1.37 2004/03/26 18:07:36 grhoten-oss Exp $
+## $Id: mh-hpux-acc,v 1.38 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Commands to generate dependency files
 GEN_DEPS.c=	:
@@ -90,9 +90,9 @@ STATIC_O = o
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ## Install libraries as executable
 INSTALL-L=$(INSTALL_PROGRAM)
diff --git a/icu4c/source/config/mh-hpux-cc b/icu4c/source/config/mh-hpux-cc
index 9af3c08ff99..f15502e97d8 100644
--- a/icu4c/source/config/mh-hpux-cc
+++ b/icu4c/source/config/mh-hpux-cc
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-hpux-cc,v 1.33 2004/03/26 18:07:36 grhoten-oss Exp $
+## $Id: mh-hpux-cc,v 1.34 2004/03/26 22:33:12 grhoten-oss Exp $
 
 
 ## This causes source/tools/pkgdata generated makefiles  to create and link
@@ -70,9 +70,9 @@ STATIC_O = o
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ## End HP/UX-specific setup
 
diff --git a/icu4c/source/config/mh-hpux-gcc b/icu4c/source/config/mh-hpux-gcc
index a10bbc34967..169b3d34bd8 100644
--- a/icu4c/source/config/mh-hpux-gcc
+++ b/icu4c/source/config/mh-hpux-gcc
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-hpux-gcc,v 1.5 2004/03/26 18:07:36 grhoten-oss Exp $
+## $Id: mh-hpux-gcc,v 1.6 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Commands to generate dependency files
 GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
@@ -73,9 +73,9 @@ STATIC_O = o
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ## End HPUX/gcc specific setup
 
diff --git a/icu4c/source/config/mh-irix b/icu4c/source/config/mh-irix
index 6f1a22428d6..0f43cf5a264 100644
--- a/icu4c/source/config/mh-irix
+++ b/icu4c/source/config/mh-irix
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-irix,v 1.24 2004/03/26 18:07:36 grhoten-oss Exp $
+## $Id: mh-irix,v 1.25 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Flags for position independent code
 SHAREDLIBCFLAGS = -shared
@@ -65,8 +65,8 @@ STATIC_O = ao
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ## End IRIX-specific setup
diff --git a/icu4c/source/config/mh-mpras b/icu4c/source/config/mh-mpras
index 8d13e36f413..8315e7289bd 100644
--- a/icu4c/source/config/mh-mpras
+++ b/icu4c/source/config/mh-mpras
@@ -3,7 +3,7 @@
 ## Copyright (c) 2003-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-mpras,v 1.3 2004/03/26 18:07:36 grhoten-oss Exp $
+## $Id: mh-mpras,v 1.4 2004/03/26 22:33:12 grhoten-oss Exp $
 ## Original contributer: Jason Gordon from NCR
 
 ## Flags for position independent code
@@ -59,7 +59,7 @@ STATIC_O = o
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390
index aff585f587f..3798d7558aa 100644
--- a/icu4c/source/config/mh-os390
+++ b/icu4c/source/config/mh-os390
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2004, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-os390,v 1.59 2004/03/26 01:22:25 grhoten-oss Exp $
+## $Id: mh-os390,v 1.60 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ###################################################################
 #                    IMPORTANT NOTE                               #
@@ -183,11 +183,11 @@ LIBUSTDIO=	$(LIBDIR)/$(LIBICU)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION).x
 
 ## Versioned libraries rules
 %$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+	$(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 %.$(SO): %$(SO_TARGET_VERSION).$(SO)
-	$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
+	$(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 
 ## Install libraries as executable
 INSTALL-L=$(INSTALL_PROGRAM)
 
-## End 390-specific setup
\ No newline at end of file
+## End 390-specific setup
diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris
index 2869524f856..a09332c49ac 100644
--- a/icu4c/source/config/mh-solaris
+++ b/icu4c/source/config/mh-solaris
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-solaris,v 1.36 2004/03/26 18:07:36 grhoten-oss Exp $
+## $Id: mh-solaris,v 1.37 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Flags for position independent code
 SHAREDLIBCFLAGS = -KPIC
@@ -69,9 +69,9 @@ STATIC_O = o
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 # 
 ifeq (strip $(GENCCODE_ASSEMBLY),)
diff --git a/icu4c/source/config/mh-solaris-gcc b/icu4c/source/config/mh-solaris-gcc
index 5d99a5078be..335109c1832 100644
--- a/icu4c/source/config/mh-solaris-gcc
+++ b/icu4c/source/config/mh-solaris-gcc
@@ -3,7 +3,7 @@
 ## Copyright (c) 1999-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 ##
-## $Id: mh-solaris-gcc,v 1.34 2004/03/26 18:07:36 grhoten-oss Exp $
+## $Id: mh-solaris-gcc,v 1.35 2004/03/26 22:33:12 grhoten-oss Exp $
 
 ## Flags for position independent code
 SHAREDLIBCFLAGS = -fPIC
@@ -57,8 +57,8 @@ STATIC_O = ao
 ## Versioned libraries rules
 
 %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-	$(RM) $@ && ln -s $< $@
+	$(RM) $@ && ln -s ${<F} $@
 %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-	$(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 
 ## End Solaris-specific setup