From d0426c2053fd0e59b160c7695e62e54df62022d2 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Wed, 28 Apr 2004 05:46:02 +0000
Subject: [PATCH] ICU-3576 Improve building and using static libraries

X-SVN-Rev: 15082
---
 icu4c/source/config/mh-cygwin-msvc | 5 -----
 icu4c/source/icudefs.mk.in         | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/icu4c/source/config/mh-cygwin-msvc b/icu4c/source/config/mh-cygwin-msvc
index 29683e90ea..3dc326f3e1 100644
--- a/icu4c/source/config/mh-cygwin-msvc
+++ b/icu4c/source/config/mh-cygwin-msvc
@@ -88,11 +88,6 @@ LIBCTESTFW=	$(top_builddir)/tools/ctestfw/$(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSU
 LIBICUTOOLUTIL=	$(LIBDIR)/$(LIBICU)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX).lib
 LIBICUIO=	$(LIBDIR)/$(LIBICU)$(IO_STUBNAME)$(ICULIBSUFFIX).lib
 
-## If we can't use the shared libraries, use the static libraries
-ifneq ($(ENABLE_SHARED),YES)
-LIBICU=$(LIBSICU)
-endif
-
 # Current full path directory.
 CURR_FULL_DIR=$(shell cygpath -wma .)
 # Current full path directory for use in source code in a -D compiler option.
diff --git a/icu4c/source/icudefs.mk.in b/icu4c/source/icudefs.mk.in
index 2d913dd6b8..87e9af4b40 100644
--- a/icu4c/source/icudefs.mk.in
+++ b/icu4c/source/icudefs.mk.in
@@ -152,7 +152,13 @@ MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
 # Prefix for the ICU library names
 ICUPREFIX = icu
 LIBPREFIX = lib
+
+## If we can't use the shared libraries, use the static libraries
+ifneq ($(ENABLE_SHARED),YES)
+LIBICU = $(LIBSICU)
+else
 LIBICU = $(LIBPREFIX)$(ICUPREFIX)
+endif
 
 # Static library prefix and file extension
 STATIC_PREFIX = s