From 3b745c115063a9c9975722e9a3a28da45f15096c Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Mon, 17 May 2004 06:37:28 +0000
Subject: [PATCH] ICU-3389 Fix make install on Windows

X-SVN-Rev: 15332
---
 icu4c/source/config/mh-cygwin-msvc   | 2 +-
 icu4c/source/data/Makefile.in        | 3 +--
 icu4c/source/icudefs.mk.in           | 2 +-
 icu4c/source/tools/pkgdata/winmode.c | 9 ++++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/icu4c/source/config/mh-cygwin-msvc b/icu4c/source/config/mh-cygwin-msvc
index f990478acee..f822b040450 100644
--- a/icu4c/source/config/mh-cygwin-msvc
+++ b/icu4c/source/config/mh-cygwin-msvc
@@ -169,7 +169,7 @@ PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR)
 
 ## Versioned import library names. The library names are versioned,
 ## but the import libraries do not need versioning.
-IMPORT_LIB = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(IMPORT_LIB_EXT)
+IMPORT_LIB = $(basename $(SO_TARGET))$(IMPORT_LIB_EXT)
 MIDDLE_IMPORT_LIB = $(IMPORT_LIB)
 FINAL_IMPORT_LIB = $(MIDDLE_IMPORT_LIB)
 
diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in
index 3c4066d5ab2..2640c47b6f1 100644
--- a/icu4c/source/data/Makefile.in
+++ b/icu4c/source/data/Makefile.in
@@ -124,8 +124,7 @@ endif
 install-local: $(OUTTMPDIR)/icudata.lst ./icupkg.inc packagedata $(OS390INSTALL)
 	$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR)
 ifneq ($(ENABLE_STATIC),)
-# It is done this way just in case the $(SO) == $(A)
-	$(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(OUTTMPDIR)/icudata.lst -I $(call native_dir,$(DESTDIR)$(ICUPKGDATA_DIR))
+	$(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(OUTTMPDIR)/icudata.lst -I $(call native_dir,$(libdir))
 endif
 	$(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(OUTTMPDIR)/icudata.lst -I $(call native_dir,$(DESTDIR)$(ICUPKGDATA_DIR))
 
diff --git a/icu4c/source/icudefs.mk.in b/icu4c/source/icudefs.mk.in
index 8813444757c..97e0084e8b8 100644
--- a/icu4c/source/icudefs.mk.in
+++ b/icu4c/source/icudefs.mk.in
@@ -45,6 +45,7 @@ ICUDATA_DIR = @pkgicudatadir@/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
 ICUDATA_BASENAME_VERSION = $(ICUPREFIX)dt@LIB_VERSION_MAJOR@
 ICUDATA_ENTRY_POINT = $(ICUDATA_BASENAME_VERSION)
 ICUDATA_PLATFORM_NAME = $(ICUDATA_BASENAME_VERSION)@ICUDATA_CHAR@
+PKGDATA_LIBSTATICNAME = -L $(STATIC_PREFIX)$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
 ifeq ($(strip $(PKGDATA_MODE)),)
 PKGDATA_MODE=@DATA_PACKAGING_MODE@
 endif
@@ -55,7 +56,6 @@ else
 ifeq ($(PKGDATA_MODE),dll)
 ICUDATA_NAME = $(ICUDATA_PLATFORM_NAME)
 PKGDATA_LIBNAME = -L $(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
-PKGDATA_LIBSTATICNAME = -L $(STATIC_PREFIX)$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
 ICUPKGDATA_DIR = $(libdir)
 else
 ICUDATA_NAME = $(ICUPREFIX)$(DATA_STUBNAME)
diff --git a/icu4c/source/tools/pkgdata/winmode.c b/icu4c/source/tools/pkgdata/winmode.c
index 60ea21242b9..ef330f5ebf7 100644
--- a/icu4c/source/tools/pkgdata/winmode.c
+++ b/icu4c/source/tools/pkgdata/winmode.c
@@ -245,6 +245,9 @@ void pkg_mode_windows(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
             "\t-@erase \"$(TARGETDIR)\\$(CMNOBJTARGET)\"\n"
             "\t-@erase \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
         T_FileStream_writeLine(makefile, tmp2);
+
+        T_FileStream_writeLine(makefile, "install: \"$(TARGETDIR)\\$(DLLTARGET)\"\n"
+                                         "\tcopy \"$(TARGETDIR)\\$(DLLTARGET)\" \"$(INSTALLTO)\\$(DLLTARGET)\"\n\n");
     } else { /* common */
         sprintf(tmp, "all: \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
         T_FileStream_writeLine(makefile, tmp);
@@ -253,10 +256,10 @@ void pkg_mode_windows(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
             "clean:\n"
             "\t-@erase \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
         T_FileStream_writeLine(makefile, tmp2);
-    }
 
-    T_FileStream_writeLine(makefile, "install: \"$(TARGETDIR)\\$(DLLTARGET)\"\n"
-                                     "\tcopy \"$(TARGETDIR)\\$(DLLTARGET)\" \"$(INSTALLTO)\\$(DLLTARGET)\"\n\n");
+        T_FileStream_writeLine(makefile, "install: \"$(TARGETDIR)\\$(CMNTARGET)\"\n"
+                                         "\tcopy \"$(TARGETDIR)\\$(CMNTARGET)\" \"$(INSTALLTO)\\$(CMNTARGET)\"\n\n");
+    }
 
     T_FileStream_writeLine(makefile, "rebuild: clean all\n\n");