From 307e38598c4174daf4ef14566a374ed54c8d3c1b Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Sat, 27 Jul 2002 07:58:30 +0000
Subject: [PATCH] ICU-1891 Slightly better fixes for z/OS archive mode, dual
 library support and batch mode without diverging too far from the standard
 Unix build.

X-SVN-Rev: 9390
---
 icu4c/source/common/Makefile.in        |  5 ++---
 icu4c/source/common/umapfile.c         |  2 +-
 icu4c/source/config/mh-os390           | 15 ++++++++++++---
 icu4c/source/tools/pkgdata/Makefile.in |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in
index dc8ff7bfa72..2c164cc76d2 100644
--- a/icu4c/source/common/Makefile.in
+++ b/icu4c/source/common/Makefile.in
@@ -45,9 +45,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
 DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
 DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
 
-# Data packaging options are set at configure time with --with-data-packaging.
-CPPFLAGS += -I. -I$(srcdir) $(LIBCPPFLAGS) @DATA_PACKAGING_CPPFLAGS@
-DEFS += -DU_LIBICUDATA_NAME=\"$(ICUDATA_NAME)\" -DU_COMMON_IMPLEMENTATION
+CPPFLAGS += -I. -I$(srcdir) $(LIBCPPFLAGS)
+DEFS += -DU_COMMON_IMPLEMENTATION
 
 # $(LIBICUDT) is either stub data or the real DLL common data.
 LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
diff --git a/icu4c/source/common/umapfile.c b/icu4c/source/common/umapfile.c
index 6709108b26e..bdb313d208e 100644
--- a/icu4c/source/common/umapfile.c
+++ b/icu4c/source/common/umapfile.c
@@ -60,7 +60,7 @@
 #       define MAP_FAILED ((void*)-1)
 #   endif
 
-#   if defined(OS390) && defined (UDATA_DLL)
+#   if defined(OS390) && defined (OS390_STUBDATA)
         /*   No memory mapping for 390 batch mode.  Fake it using dll loading.  */
 #       include <dll.h>
 #       include "cstring.h"
diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390
index 1253d8f3fbe..e69f46643f4 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.43 2002/07/18 22:01:30 grhoten-oss Exp $
+## $Id: mh-os390,v 1.44 2002/07/27 07:58:30 grhoten-oss Exp $
 
 ###################################################################
 #                    IMPORTANT NOTE                               #
@@ -36,7 +36,7 @@ endif
 # TODO: Consider using  -Wc,roc,rent for making the data readonly
 CFLAGS          += -Wc,"langlvl(extended),spill(2000)" $(ICU_BUILD_OPTIONS) $(ICU_IEEE) -Wc,dll,expo
 CXXFLAGS        += -Wc,"langlvl(extended),spill(2000)" $(ICU_BUILD_OPTIONS) $(ICU_IEEE) -Wc,dll,expo
-DEFS            += -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -D_MSE_PROTOS -D_SHR_TZNAME -D_SHR_TIMEZONE
+DEFS            += -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -D_MSE_PROTOS -D_SHR_TZNAME -D_SHR_TIMEZONE -DU_LIBICUDATA_NAME=\"$(ICUDATA_NAME)\"
 ARFLAGS         = -cr
 
 ## OS390BATCH
@@ -84,12 +84,21 @@ STATIC_O = o
 ifeq ($(OS390_STUBDATA),1)
 ## Suffix of the subset data library for dual common library support
 STUB_SUFFIX=_stub
+DEFS      += -DOS390_STUBDATA
 endif
 
 ifeq ($(OS390BATCH),1)
+ifeq ($(OS390_STUBDATA),1)
 BATCH_STUB_TARGET=	"//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}D1)'"
-BATCH_LIBICUUC=		"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}UC)'"
 BATCH_LIBICUDT=		"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}D1)'"
+else
+BATCH_STUB_TARGET=	"//'${LOADMOD}(IXMI${SO_TARGET_VERSION_MAJOR}DA)'"
+BATCH_LIBICUDT=		"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}DA)'"
+endif
+BATCH_LIBICUUC=		"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}UC)'"
+BATCH_LIBICUI18N=	"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}IN)'"
+BATCH_LIBICUSTDIO=	"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}IO)'"
+BATCH_LIBICULE=		"//'${LOADEXP}(IXMI${SO_TARGET_VERSION_MAJOR}LE)'"
 endif
 
 ## Link commands to link to ICU libs
diff --git a/icu4c/source/tools/pkgdata/Makefile.in b/icu4c/source/tools/pkgdata/Makefile.in
index 187490ccad5..8be6bfba2c5 100644
--- a/icu4c/source/tools/pkgdata/Makefile.in
+++ b/icu4c/source/tools/pkgdata/Makefile.in
@@ -29,7 +29,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) mkmap.tmp $(ALL_MAN_FILES)
 TARGET = pkgdata
 
 CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil
-DEFS += -DU_LIBICUDATA_NAME=\"$(ICUDATA_NAME)\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
+DEFS += -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = pkgdata.o pkgtypes.o gmake.o dllmode.o cmnmode.o filemode.o sttcmode.o