From 87e6f333bd481b42784ad52f2cdad3a794c8988a Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Tue, 12 Jan 2010 02:24:47 +0000
Subject: [PATCH] ICU-7213 get non-dll data init

X-SVN-Rev: 27218
---
 icu4c/source/tools/icuinfo/Makefile.in |  2 ++
 icu4c/source/tools/icuinfo/icuinfo.cpp | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/icu4c/source/tools/icuinfo/Makefile.in b/icu4c/source/tools/icuinfo/Makefile.in
index 5a98f8aa692..fcd3ecbbb7a 100644
--- a/icu4c/source/tools/icuinfo/Makefile.in
+++ b/icu4c/source/tools/icuinfo/Makefile.in
@@ -34,6 +34,8 @@ DEPS = $(OBJECTS:.o=.d)
 
 # pass some information
 
+ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME)
+
 CPPFLAGS+=  -DU_PLATFORM=\"@platform@\"  -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\"@CC@\" -DU_CXX=\"@CXX@\"
 # -DENABLE_RELEASE=@ENABLE_RELEASE@ -DENABLE_DEBUG=@ENABLE_DEBUG@ "
 
diff --git a/icu4c/source/tools/icuinfo/icuinfo.cpp b/icu4c/source/tools/icuinfo/icuinfo.cpp
index 22a1305633c..15df3d7c6f4 100644
--- a/icu4c/source/tools/icuinfo/icuinfo.cpp
+++ b/icu4c/source/tools/icuinfo/icuinfo.cpp
@@ -39,7 +39,7 @@
 static UOption options[]={
   /*0*/ UOPTION_HELP_H,
   /*1*/ UOPTION_HELP_QUESTION_MARK,
-  /*2*/ UOPTION_DEF("interactive", 'i', UOPT_NO_ARG),
+  /*2*/ UOPTION_ICUDATADIR,
   /*3*/ UOPTION_VERBOSE,
   /*4*/ UOPTION_DEF("list-plugins", 'L', UOPT_NO_ARG),
   /*5*/ UOPTION_DEF("milisecond-time", 'm', UOPT_NO_ARG),
@@ -297,8 +297,8 @@ void cmd_version(UBool noLoad)
     printf("Cygwin: CYGWINMSVC\n");
 #endif
     printf("ICUDATA: %s\n", U_ICUDATA_NAME);
-    printf("Data Directory: %s\n", u_getDataDirectory());
     u_init(&status);
+    printf("Data Directory: %s\n", u_getDataDirectory());
     printf("ICU Initialization returned: %s\n", u_errorName(status));
     printf( "Default locale: %s\n", uloc_getDefault());
     {
@@ -678,8 +678,10 @@ main(int argc, char* argv[]) {
     }
     
     if(options[2].doesOccur) {
-        doInteractive();
-    } else if(options[5].doesOccur) {
+      u_setDataDirectory(options[2].value);
+    }
+
+    if(options[5].doesOccur) {
       cmd_millis();
       didSomething=TRUE;
     } else {