diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390 index 68d7ad2e73c..8c27f82eefc 100644 --- a/icu4c/source/config/mh-os390 +++ b/icu4c/source/config/mh-os390 @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2001, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-os390,v 1.27 2001/11/06 22:19:08 grhoten-oss Exp $ +## $Id: mh-os390,v 1.28 2001/11/07 22:53:22 grhoten-oss Exp $ ################################################################### # IMPORTANT NOTE # @@ -61,7 +61,7 @@ LD_RPATH= -I ## Versioned target for a shared library. FINAL_SO_TARGET = $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) -MIDDLE_SO_TARGET = +MIDDLE_SO_TARGET = $(basename $(SO_TARGET).$(SO)) ## Shared object suffix (switch to dll for shared library build) SO = dll @@ -70,9 +70,12 @@ STATIC_O = o ## Suffix of the subset data library for batch mode BATCH_STUB_SUFFIX=_390 + +ifeq ($(OS390BATCH),1) BATCH_STUB_TARGET= "//'${LOADMOD}(IXMICUD1)'" BATCH_LIBICUUC= "//'${LOADEXP}(IXMICUUC)'" BATCH_LIBICUDT= "//'${LOADEXP}(IXMICUD1)'" +endif ## Link commands to link to ICU libs #LIBICUDT= $(top_builddir)/data/libicudata.$(SO_TARGET_VERSION).x diff --git a/icu4c/source/stubdata/Makefile.in b/icu4c/source/stubdata/Makefile.in index 1479e6540b7..9c4d90a617e 100644 --- a/icu4c/source/stubdata/Makefile.in +++ b/icu4c/source/stubdata/Makefile.in @@ -49,7 +49,7 @@ endif ifneq ($(ENABLE_SHARED),) SO_TARGET = libicudata.$(SO) MIDDLE_SO_TARGET = lib$(ICUDATA_NAME)$(BATCH_SUFFIX).$(SO) -ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(BATCH_LIBICUDT) +ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(BATCH_STUB_TARGET) endif ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS) @@ -134,7 +134,7 @@ $(MIDDLE_SO_TARGET): $(OBJECTS) $(SO_TARGET): $(MIDDLE_SO_TARGET) $(RM) $(SO_TARGET) && ln -s $(MIDDLE_SO_TARGET) $(SO_TARGET) ifeq ($(OS390BATCH),1) -$(BATCH_LIBICUDT): $(OBJECTS) +$(BATCH_STUB_TARGET): $(OBJECTS) $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS) endif # OS390BATCH endif