diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in index 3341887324..1bbff7039a 100644 --- a/icu4c/source/data/Makefile.in +++ b/icu4c/source/data/Makefile.in @@ -84,6 +84,7 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi ifeq ($(OS390DATA),1) OS390PKG= package390 +OS390INSTALL= install390 endif all-local: packagedata testdata packagetest $(OS390PKG) @@ -125,7 +126,7 @@ cleanpackage: $(RMV) $(ICUDATA_NAME).* build/icudata.lst build/*.mak ## Install ICU data. Make a convenience link 'icudata' library if it's a library mode. -install-local: build/icudata.lst $(top_builddir)/tools/pkgdata/icupkg.inc install-convrtrstxt +install-local: build/icudata.lst $(top_builddir)/tools/pkgdata/icupkg.inc install-convrtrstxt $(OS390INSTALL) $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir) ( cd build ; $(INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) -e $(ICUDATA_BASENAME_VERSION) -T . -s . -p $(ICUDATA_NAME) icudata.lst -I $(DESTDIR)$(libdir) ) ifeq ($(strip $(PKGDATA_MODE)),dll) @@ -146,9 +147,13 @@ testdata: $(SPECIALTESTDATA) #### #### #### 390 support +install390: build/icudata390.lst $(top_builddir)/tools/pkgdata/icupkg.inc + $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir) + ( cd build ; $(INVOKE) $(PKGDATA) -s . -T ../tmp3901 -p $(ICUDATA_NAME)$(BATCH_STUB_SUFFIX) -e $(ICUDATA_BASENAME_VERSION) icudata390.lst -m dll -I $(DESTDIR)$(libdir)) + #### $(LIB_ICUDATA_NAME)$(BATCH_SUFFIX) is the subset data for batch mode package390: build/icudata390.lst build/icudata.lst $(top_builddir)/tools/pkgdata/icupkg.inc @$(MKINSTALLDIRS) tmp3901 - ( cd build ; $(INVOKE) $(PKGDATA) -s . -T ../tmp3901 -p $(ICUDATA_NAME)_390 -e $(ICUDATA_BASENAME_VERSION) icudata390.lst -m dll) + ( cd build ; $(INVOKE) $(PKGDATA) -s . -T ../tmp3901 -p $(ICUDATA_NAME)$(BATCH_STUB_SUFFIX) -e $(ICUDATA_BASENAME_VERSION) icudata390.lst -m dll) cp $(top_builddir)/data/$(LIB_ICUDATA_NAME)$(BATCH_STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(BATCH_STUB_SUFFIX).$(SO) diff --git a/icu4c/source/stubdata/Makefile.in b/icu4c/source/stubdata/Makefile.in index 9c4d90a617..766c9dcb3f 100644 --- a/icu4c/source/stubdata/Makefile.in +++ b/icu4c/source/stubdata/Makefile.in @@ -48,7 +48,7 @@ endif # ifneq ($(ENABLE_SHARED),) SO_TARGET = libicudata.$(SO) -MIDDLE_SO_TARGET = lib$(ICUDATA_NAME)$(BATCH_SUFFIX).$(SO) +MIDDLE_SO_TARGET = lib$(ICUDATA_NAME)$(BATCH_STUB_SUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(BATCH_STUB_TARGET) endif @@ -104,6 +104,7 @@ ifneq ($(ENABLE_STATIC),) $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) endif ifneq ($(ENABLE_SHARED),) + $(INSTALL-L) $(MIDDLE_SO_TARGET) $(DESTDIR)$(libdir)/$(MIDDLE_SO_TARGET) $(INSTALL-L) $(SO_TARGET) $(DESTDIR)$(libdir)/$(SO_TARGET) endif