ICU-7689 fix AIX build issue
X-SVN-Rev: 29889
diff --git a/source/Makefile.in b/source/Makefile.in
index 1f4e6bc..7b6b114 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -280,6 +280,8 @@
C0DATALIB=$(LIBICU)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
else
C0DATALIB=$(LIBICU)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(A)
+LIB_STATIC_ICUDATA_NAME=$(LIBSICU)$(DATA_STUBNAME)$(ICULIBSUFFIX)
+SC0DATALIB=$(LIB_STATIC_ICUDATA_NAME).$(A)
endif
ifeq ($(ICU4C0),)
@@ -291,6 +293,15 @@
$(NEWLIBDIR)/$(C0DATALIB): lib/$(C0DATALIB)
@$(MKINSTALLDIRS) $(NEWLIBDIR)
cp lib/$(LIBICU)$(DATA_STUBNAME)* $(NEWLIBDIR)/
+ifeq ($(PKGDATA_MODE),static)
+ifneq ($(C0DATALIB),$(SC0DATALIB))
+ cp $(NEWLIBDIR)/$(C0DATALIB) $(NEWLIBDIR)/$(SC0DATALIB)
+else
+ @echo $(SC0DATALIB) is already OK
+endif
+else
+ @echo $(PKGDATA_MODE) is not static - data OK
+endif
endif
diff --git a/source/common/Makefile.in b/source/common/Makefile.in
index eac883b..30c54db 100644
--- a/source/common/Makefile.in
+++ b/source/common/Makefile.in
@@ -24,7 +24,7 @@
SVC_HOOK_INC=$(top_builddir)/common/svchook.mk
## Extra files to remove for 'make clean'
-CLEANFILES = *~ $(DEPS) $(IMPORT_LIB) $(MIDDLE_IMPORT_LIB) $(FINAL_IMPORT_LIB) $(SVC_HOOK_INC)
+CLEANFILES = *~ $(DEPS) $(IMPORT_LIB) $(MIDDLE_IMPORT_LIB) $(FINAL_IMPORT_LIB) $(SVC_HOOK_INC) norm2.o norm2.d
## Target information
diff --git a/source/samples/c0test/c0test.c b/source/samples/c0test/c0test.c
index 456e8ed..62f80cb 100644
--- a/source/samples/c0test/c0test.c
+++ b/source/samples/c0test/c0test.c
@@ -440,6 +440,14 @@
char *dl = NULL;
UErrorCode status = U_ZERO_ERROR;
+
+ u_init(&status);
+
+ if(U_FAILURE(status)) {
+ fprintf(stderr, "Error: u_init returned %s - check that data was built properly.\n\n\n\n", u_errorName(status));
+ return 1;
+ }
+
#if 1
dl = uloc_getDefault();
