Index: source/config/mh-os390 |
diff --git a/source/config/mh-os390 b/source/config/mh-os390 |
index 056f89144367d494c12afa1e89373a2a6244c422..decd98b08cc6d351cd73932d29cce8974123fe8d 100644 |
--- a/source/config/mh-os390 |
+++ b/source/config/mh-os390 |
@@ -1,6 +1,6 @@ |
## -*-makefile-*- |
## os/390, z/OS specific setup |
-## Copyright (c) 1999-2013, International Business Machines Corporation and |
+## Copyright (c) 1999-2014, International Business Machines Corporation and |
## others. All Rights Reserved. |
################################################################### |
@@ -42,13 +42,13 @@ IEEE390=1#M# |
endif |
ifeq (${IEEE390}, 1) |
-ICU_IEEE =#M# |
-else |
ICU_IEEE = -Wc,'FLOAT(IEEE)' -DIEEE_754=0#M# |
+else |
+ICU_IEEE =#M# |
endif |
## Additional flags when building libraries and with threads |
-THREADSCPPFLAGS = -D_OPEN_THREADS |
+THREADSCPPFLAGS = -D_OPEN_THREADS=3 |
# For a dynamically called DLL module to share access to the POSIX external |
# variables, with its caller, the DLL module must define these _SHR_* macros. |
@@ -137,30 +137,37 @@ DEFS += -DOS390_STUBDATA -DU_LIBICUDATA_NAME=\"$(ICUPREFIX)$(DATA_STUBNAME) |
endif |
ifeq ($(OS390BATCH),1) |
+## PDS_NAME_PREFIX sets the prefix of the PDS dataset name while keeping the ICU version number. |
+## To use custom names set ICU_PDS_NAME and ICU_PDS_NAME_SUFFIX |
## IXM is used as a name prefix for XML Toolkit, default value |
ifeq ($(PDS_NAME_PREFIX),) |
PDS_NAME_PREFIX= IXMI |
endif |
+ifeq ($(ICU_PDS_NAME),) |
+PDS_FULL_NAME=${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR} |
+else |
+PDS_FULL_NAME=${ICU_PDS_NAME} |
+endif |
ifeq ($(OS390_STUBDATA),1) |
-BATCH_STUB_TARGET= "//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}D1)'" |
-BATCH_LIBICUDT= "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}D1)'" |
+BATCH_STUB_TARGET= "//'${LOADMOD}(${PDS_FULL_NAME}D1${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_LIBICUDT= "//'${LOADEXP}(${PDS_FULL_NAME}D1${ICU_PDS_NAME_SUFFIX})'" |
else |
-BATCH_STUB_TARGET= "//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}DA)'" |
-BATCH_LIBICUDT= "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}DA)'" |
+BATCH_STUB_TARGET= "//'${LOADMOD}(${PDS_FULL_NAME}DA${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_LIBICUDT= "//'${LOADEXP}(${PDS_FULL_NAME}DA${ICU_PDS_NAME_SUFFIX})'" |
PKGDATA_DEFS += -DU_LIBICUDATA_NAME=\"$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)\" |
endif |
-BATCH_COMMON_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}UC)'" |
-BATCH_I18N_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}IN)'" |
-BATCH_IO_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}IO)'" |
-BATCH_LAYOUT_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}LE)'" |
-BATCH_LAYOUTEX_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}LX)'" |
- |
-BATCH_LIBICUUC= "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}UC)'" |
-BATCH_LIBICUI18N= "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}IN)'" |
-BATCH_LIBICUIO= "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}IO)'" |
-BATCH_LIBICULE= "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}LE)'" |
-BATCH_LIBICULX= "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}LX)'" |
+BATCH_COMMON_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}UC${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_I18N_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}IN${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_IO_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}IO${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_LAYOUT_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}LE${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_LAYOUTEX_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}LX${ICU_PDS_NAME_SUFFIX})'" |
+ |
+BATCH_LIBICUUC= "//'${LOADEXP}(${PDS_FULL_NAME}UC${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_LIBICUI18N= "//'${LOADEXP}(${PDS_FULL_NAME}IN${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_LIBICUIO= "//'${LOADEXP}(${PDS_FULL_NAME}IO${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_LIBICULE= "//'${LOADEXP}(${PDS_FULL_NAME}LE${ICU_PDS_NAME_SUFFIX})'" |
+BATCH_LIBICULX= "//'${LOADEXP}(${PDS_FULL_NAME}LX${ICU_PDS_NAME_SUFFIX})'" |
endif |