ICU-551.41.tar.gz

[apple/icu.git] / makefile

diff --git a/makefile b/makefile
index b4f9c8b1308a248ccfba37e973925192e0c8ea09..81eec170d55856d77ba94ff8cf4d358b560f74e2 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,11 +1,43 @@
 ##
 # Wrapper makefile for ICU
 ##
 # Wrapper makefile for ICU

-# Copyright (C) 2003-2010 Apple Inc. All rights reserved.
+# Copyright (C) 2003-2015 Apple Inc. All rights reserved.

 #
 # See http://www.gnu.org/manual/make/html_chapter/make_toc.html#SEC_Contents
 # for documentation on makefiles. Most of this was culled from the ncurses makefile.
 #
 #
 # See http://www.gnu.org/manual/make/html_chapter/make_toc.html#SEC_Contents
 # for documentation on makefiles. Most of this was culled from the ncurses makefile.
 #

-##
+#################################
+# Notes on building for AAS using Windows (7) + Visual Studio (2010) + Cygwin:
+#
+# Either this should be run indirectly from the VS command prompt via the
+# BuildICUForAAS script or project, using the instructions there (which build
+# both 32-bit and 64-bit), or it should be run from within Cygwin using the
+# following instructions or equivalent (different steps for 32-bit or 64-bit):
+#
+# 1. From VS command prompt, run vcvarsall.bat to set various environment variables.
+#    For a 32-bit build:
+#    > "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+#    For a 64-bit build:
+#    > "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
+#
+# 2. Launch Cygwin, e.g.
+#    > C:\cygwin\Cygwin.bat
+#
+# 3. Within cygwin, cd to the top level of the ICU sources directory, e.g.
+#    $ cd ICU
+#
+# 4. Adjust the PATH to put the appropriate VC tools directory first:
+#    For a 32-bit build:
+#    $ export PATH="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin/":$PATH
+#    For a 64-bit build:
+#    $ export PATH="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin/amd64/":$PATH
+#
+# 5. Run the ICU makefile
+#    For a 32-bit build:
+#    make [install] WINDOWS=YES [ARCH64=NO] [DSTROOT=...]
+#    For a 64-bit build:
+#    make [install] WINDOWS=YES ARCH64=YES [DSTROOT=...]
+#
+#################################

 
 #################################
 #################################
 
 #################################
 #################################


@@ -18,40 +50,175 @@
 # when used. This is in contrast to using '=' which denotes a
 # recursively expanded variable.
 
 # when used. This is in contrast to using '=' which denotes a
 # recursively expanded variable.
 

-SHELL := /bin/sh
-

 # Sane defaults, which are typically overridden on the command line.
 WINDOWS=NO
 LINUX=NO
 ARCH64=NO
 
 # Sane defaults, which are typically overridden on the command line.
 WINDOWS=NO
 LINUX=NO
 ARCH64=NO
 

-SRCROOT=$(shell pwd)
-OBJROOT=$(SRCROOT)/build
-DSTROOT=$(OBJROOT)
-SYMROOT=$(OBJROOT)
+# chicken and egg problem: we can't use cygpath until PATH & SHELL are set,
+# but we have to convert VS100VCTOOLS_PATH in order to set PATH. So instead we
+# convert using subst.
+ifeq "$(WINDOWS)" "YES"
+       ifneq "$(VS100VCTOOLS_PATH)" ""
+               VS100VCTOOLS_CYGPATH:= /cygdrive/$(subst :/,/,$(subst \,/,$(VS100VCTOOLS_PATH)))
+               PATH:=$(VS100VCTOOLS_CYGPATH):/usr/local/bin/:/usr/bin/:$(PATH)
+       endif
+endif
+$(info # PATH=$(PATH))
+
+# For some reason, cygwin bash (at least when run non-login) needs to use
+# bash for pwd, echo etc. (but uname does not work, see below)
+ifeq "$(WINDOWS)" "YES"
+       SHELL := /bin/bash
+else
+       SHELL := /bin/sh
+endif
+
+# if building for windows from batch script, convert Win-style paths
+# for SRCROOT etc. to cygwin-style paths. Don't define them if not
+# already defined.
+ifeq "$(WINDOWS)" "YES"
+       ifneq "$(VS100VCTOOLS_PATH)" ""
+               ifdef SRCROOT
+                       SRCROOT:=$(shell /bin/cygpath -ua $(subst \,/,$(SRCROOT)))
+               endif
+               ifdef OBJROOT
+                       OBJROOT:=$(shell /bin/cygpath -ua $(subst \,/,$(OBJROOT)))
+               endif
+               ifdef DSTROOT
+                       DSTROOT:=$(shell /bin/cygpath -ua $(subst \,/,$(DSTROOT)))
+               endif
+               ifdef SYMROOT
+                       SYMROOT:=$(shell /bin/cygpath -ua $(subst \,/,$(SYMROOT)))
+               endif
+       endif
+endif
+
+ifndef SRCROOT
+       SRCROOT:=$(shell pwd)
+endif
+ifndef OBJROOT
+       OBJROOT:=$(SRCROOT)/build
+endif
+ifndef DSTROOT
+       DSTROOT:=$(OBJROOT)
+endif
+ifndef SYMROOT
+       SYMROOT:=$(OBJROOT)
+endif
+
+ifeq "$(WINDOWS)" "YES"
+       ifeq "$(ARCH64)" "YES"
+               OBJROOT_CURRENT=$(OBJROOT)/obj64
+               SYMROOT_CURRENT=$(SYMROOT)/obj64
+       else
+               OBJROOT_CURRENT=$(OBJROOT)/obj32
+               SYMROOT_CURRENT=$(SYMROOT)/obj32
+       endif
+else ifeq "$(LINUX)" "YES"
+       ifeq "$(ARCH64)" "YES"
+               OBJROOT_CURRENT=$(OBJROOT)/obj64
+               SYMROOT_CURRENT=$(SYMROOT)/obj64
+       else
+               OBJROOT_CURRENT=$(OBJROOT)/obj32
+               SYMROOT_CURRENT=$(SYMROOT)/obj32
+       endif
+else
+       OBJROOT_CURRENT=$(OBJROOT)
+       SYMROOT_CURRENT=$(SYMROOT)
+endif

 CROSSHOST_OBJROOT=$(OBJROOT)/crossbuildhost
 APPLE_INTERNAL_DIR=/AppleInternal
 RC_ARCHS=
 CROSSHOST_OBJROOT=$(OBJROOT)/crossbuildhost
 APPLE_INTERNAL_DIR=/AppleInternal
 RC_ARCHS=

-MAC_OS_X_VERSION_MIN_REQUIRED=1060
-MAC_OS_X_VERSION_MIN_STRING=10.6
+MAC_OS_X_VERSION_MIN_REQUIRED=1090
+OSX_HOST_VERSION_MIN_STRING=10.9
+ifndef IPHONEOS_DEPLOYMENT_TARGET
+       IOS_VERSION_TARGET_STRING=9.0
+else ifeq "$(IPHONEOS_DEPLOYMENT_TARGET)" ""
+       IOS_VERSION_TARGET_STRING=9.0
+else
+       IOS_VERSION_TARGET_STRING=$(IPHONEOS_DEPLOYMENT_TARGET)
+endif
+ifndef MACOSX_DEPLOYMENT_TARGET
+       OSX_VERSION_TARGET_STRING=10.11
+else ifeq "$(MACOSX_DEPLOYMENT_TARGET)" ""
+       OSX_VERSION_TARGET_STRING=10.11
+else
+       OSX_VERSION_TARGET_STRING=$(MACOSX_DEPLOYMENT_TARGET)
+endif
+ifndef WATCHOS_DEPLOYMENT_TARGET
+       WATCHOS_VERSION_TARGET_STRING=2.0
+else ifeq "$(WATCHOS_DEPLOYMENT_TARGET)" ""
+       WATCHOS_VERSION_TARGET_STRING=2.0
+else
+       WATCHOS_VERSION_TARGET_STRING=$(WATCHOS_DEPLOYMENT_TARGET)
+endif
+ifndef TVOS_DEPLOYMENT_TARGET
+       TVOS_VERSION_TARGET_STRING=9.0
+else ifeq "$(TVOS_DEPLOYMENT_TARGET)" ""
+       TVOS_VERSION_TARGET_STRING=9.0
+else
+       TVOS_VERSION_TARGET_STRING=$(TVOS_DEPLOYMENT_TARGET)
+endif

 
 

-UNAME_PROCESSOR=$(shell uname -p)
+$(info # SRCROOT=$(SRCROOT))
+$(info # DSTROOT=$(DSTROOT))
+$(info # OBJROOT=$(OBJROOT))
+$(info # IOS_VERSION_TARGET_STRING=$(IOS_VERSION_TARGET_STRING))
+$(info # OSX_VERSION_TARGET_STRING=$(OSX_VERSION_TARGET_STRING))
+$(info # WATCHOS_VERSION_TARGET_STRING=$(WATCHOS_VERSION_TARGET_STRING))
+$(info # TVOS_VERSION_TARGET_STRING=$(TVOS_VERSION_TARGET_STRING))
+
+# For some reason, under cygwin, bash uname is not found, and
+# sh uname does not produce a result with -p or -m. So we just
+# hardcode here.
+ifeq "$(WINDOWS)" "YES"
+       UNAME_PROCESSOR:=i386
+else
+       UNAME_PROCESSOR:=$(shell uname -p)
+endif
+
+# The following is a holdover from use of Makefile.indigo;
+# should just change to use DSTROOT everywhere instead of DEST_ROOT
+DEST_ROOT=$(DSTROOT)/
+
+ifndef SDKROOT
+       SDKPATH:=/
+else ifeq "$(SDKROOT)" ""
+       SDKPATH:=/
+else
+       SDKPATH:=$(shell xcodebuild -version -sdk $(SDKROOT) Path)
+       ifeq "$(SDKPATH)" ""
+               SDKPATH:=/
+       endif
+endif

 ifneq "$(RC_ARCHS)" ""
 ifneq "$(RC_ARCHS)" ""

-       ifneq "$(SDKROOT)" ""
+       ifneq "$(filter arm armv6 armv7 armv7s arm64,$(RC_ARCHS))" ""

                CROSS_BUILD=YES
                CROSS_BUILD=YES

+               BUILD_TYPE=DEVICE

        else ifeq "$(RC_INDIGO)" "YES"
                CROSS_BUILD=YES
        else ifeq "$(RC_INDIGO)" "YES"
                CROSS_BUILD=YES

+               BUILD_TYPE=SIMULATOR

        else
                CROSS_BUILD=NO
        else
                CROSS_BUILD=NO

+               BUILD_TYPE=

        endif
        INSTALLHDRS_ARCH=-arch $(shell echo $(RC_ARCHS) | cut -d' ' -f1)
 else
        CROSS_BUILD=NO
        INSTALLHDRS_ARCH=
        endif
        INSTALLHDRS_ARCH=-arch $(shell echo $(RC_ARCHS) | cut -d' ' -f1)
 else
        CROSS_BUILD=NO
        INSTALLHDRS_ARCH=

+       BUILD_TYPE=

 endif
 $(info # RC_ARCHS=$(RC_ARCHS))
 $(info # INSTALLHDRS_ARCH=$(INSTALLHDRS_ARCH))
 $(info # buildhost=$(UNAME_PROCESSOR))
 endif
 $(info # RC_ARCHS=$(RC_ARCHS))
 $(info # INSTALLHDRS_ARCH=$(INSTALLHDRS_ARCH))
 $(info # buildhost=$(UNAME_PROCESSOR))

+$(info # SDKROOT=$(SDKROOT))
+$(info # SDKPATH=$(SDKPATH))
+$(info # RC_INDIGO=$(RC_INDIGO))
+$(info # CROSS_BUILD=$(CROSS_BUILD))
+$(info # BUILD_TYPE=$(BUILD_TYPE))
+$(info # DEST_ROOT=$(DEST_ROOT))
+

 
 # FORCEENDIAN below is to override silly configure behavior in which if
 # __APPLE_CC__ is defined and archs are in { ppc, ppc64, i386, x86_64 }
 
 # FORCEENDIAN below is to override silly configure behavior in which if
 # __APPLE_CC__ is defined and archs are in { ppc, ppc64, i386, x86_64 }


@@ -60,8 +227,8 @@ $(info # buildhost=$(UNAME_PROCESSOR))
 #
 ifeq "$(CROSS_BUILD)" "YES"
        RC_ARCHS_FIRST=$(shell echo $(RC_ARCHS) | cut -d' ' -f1)
 #
 ifeq "$(CROSS_BUILD)" "YES"
        RC_ARCHS_FIRST=$(shell echo $(RC_ARCHS) | cut -d' ' -f1)

-       TARGET_SPEC=$(RC_ARCHS_FIRST)-apple-darwin10.0.0
-       ENV_CONFIGURE_ARCHS=$(RC_ARCHS:%=-arch %)
+       TARGET_SPEC=$(RC_ARCHS_FIRST)-apple-darwin14.0.0
+       ENV_CONFIGURE_ARCHS=-arch $(RC_ARCHS_FIRST)

        ICUPKGTOOLIBS="$(CROSSHOST_OBJROOT)/lib:$(CROSSHOST_OBJROOT)/stubdata"
        ICUPKGTOOL=$(CROSSHOST_OBJROOT)/bin/icupkg
        ifeq "$(filter-out i386 x86_64,$(RC_ARCHS))" ""
        ICUPKGTOOLIBS="$(CROSSHOST_OBJROOT)/lib:$(CROSSHOST_OBJROOT)/stubdata"
        ICUPKGTOOL=$(CROSSHOST_OBJROOT)/bin/icupkg
        ifeq "$(filter-out i386 x86_64,$(RC_ARCHS))" ""


@@ -72,64 +239,92 @@ ifeq "$(CROSS_BUILD)" "YES"
 else ifeq "$(LINUX)" "YES"
        TARGET_SPEC=$(UNAME_PROCESSOR)-unknown-linux-gnu
        ENV_CONFIGURE_ARCHS=
 else ifeq "$(LINUX)" "YES"
        TARGET_SPEC=$(UNAME_PROCESSOR)-unknown-linux-gnu
        ENV_CONFIGURE_ARCHS=

-       ICUPKGTOOLIBS="$(OBJROOT)/lib:$(OBJROOT)/stubdata"
-       ICUPKGTOOL=$(OBJROOT)/bin/icupkg
+       ICUPKGTOOLIBS="$(OBJROOT_CURRENT)/lib:$(OBJROOT_CURRENT)/stubdata"
+       ICUPKGTOOL=$(OBJROOT_CURRENT)/bin/icupkg

        FORCEENDIAN=
 else
        FORCEENDIAN=
 else

-       TARGET_SPEC=$(UNAME_PROCESSOR)-apple-darwin10.0.0
+       TARGET_SPEC=$(UNAME_PROCESSOR)-apple-darwin14.0.0

        ENV_CONFIGURE_ARCHS=
        ENV_CONFIGURE_ARCHS=

-       ICUPKGTOOLIBS="$(OBJROOT)/lib:$(OBJROOT)/stubdata"
-       ICUPKGTOOL=$(OBJROOT)/bin/icupkg
+       ICUPKGTOOLIBS="$(OBJROOT_CURRENT)/lib:$(OBJROOT_CURRENT)/stubdata"
+       ICUPKGTOOL=$(OBJROOT_CURRENT)/bin/icupkg

        FORCEENDIAN=
 endif
 $(info # TARGET_SPEC=$(TARGET_SPEC))
 $(info # ENV_CONFIGURE_ARCHS=$(ENV_CONFIGURE_ARCHS))
 
        FORCEENDIAN=
 endif
 $(info # TARGET_SPEC=$(TARGET_SPEC))
 $(info # ENV_CONFIGURE_ARCHS=$(ENV_CONFIGURE_ARCHS))
 

-ifeq "$(RC_INDIGO)" "YES"
-       -include /Developer/AppleInternal/Makefiles/Makefile.indigo
-       ifndef SDKROOT
-               SDKROOT=$(INDIGO_PREFIX)
-       endif
-       DEST_ROOT=$(DSTROOT)/$(INDIGO_PREFIX)/
-else
-       DEST_ROOT=$(DSTROOT)
+ICU_TARGET_VERSION_FOR_TZ_EXTRA :=
+ifeq "$(BUILD_TYPE)" "SIMULATOR"
+       ICU_TARGET_VERSION_FOR_TZ_EXTRA := -mmacosx-version-min=$(OSX_HOST_VERSION_MIN_STRING)

 endif
 endif

-$(info # SDKROOT=$(SDKROOT))
-$(info # RC_INDIGO=$(RC_INDIGO))
-$(info # CROSS_BUILD=$(CROSS_BUILD))

 
 

-SET_MACOSX_MIN_VER :=
-ifeq "$(filter arm armv6 armv7,$(RC_ARCHS))" ""
-       THUMB_FLAG =
-       ifneq "$(SDKROOT)" ""
-               SET_MACOSX_MIN_VER := -mmacosx-version-min=$(MAC_OS_X_VERSION_MIN_STRING)
-       endif
-else
+ifeq "$(BUILD_TYPE)" "DEVICE"

        THUMB_FLAG = -mthumb
        THUMB_FLAG = -mthumb

+else
+       THUMB_FLAG =

 endif
 
 endif
 

-# even for a crossbuild host build, we want to use the target's tzdata
-export TZDATA:=$(lastword $(wildcard $(SDKROOT)/usr/local/share/tz/tzdata*.tar.gz))
+# even for a crossbuild host build, we want to use the target's latest tzdata as pointed to by latest_tzdata.tar.gz
+ifeq "$(shell test -d $(SDKPATH)/usr/local/share/tz && echo YES )" "YES"
+       export TZDATA:=$(SDKPATH)/usr/local/share/tz/$(shell readlink $(SDKPATH)/usr/local/share/tz/latest_tzdata.tar.gz)
+endif

 $(info # TZDATA=$(TZDATA))
 
 ifeq "$(WINDOWS)" "YES"
        EMBEDDED:=0
 $(info # TZDATA=$(TZDATA))
 
 ifeq "$(WINDOWS)" "YES"
        EMBEDDED:=0

+       WATCHOS:=0
+       TVOS:=0
+       SIMULATOROS := 0

 else ifeq "$(LINUX)" "YES"
        CC := gcc
        CXX := g++
        EMBEDDED:=0
 else ifeq "$(LINUX)" "YES"
        CC := gcc
        CXX := g++
        EMBEDDED:=0

-       ISYSROOT =
-else ifeq "$(SDKROOT)" ""
-       CC := $(shell xcrun -find llvm-gcc-4.2)
-       CXX := $(shell xcrun -find llvm-g++-4.2)
-       EMBEDDED:=$(shell $(CXX) -E -dM -x c -include TargetConditionals.h /dev/null | fgrep TARGET_OS_EMBEDDED | cut -d' ' -f3)
+       WATCHOS:=0
+       TVOS:=0
+       SIMULATOROS := 0

        ISYSROOT =
 else
        ISYSROOT =
 else

-       CC := $(shell xcrun -sdk $(SDKROOT) -find gcc)
-       CXX := $(shell xcrun -sdk $(SDKROOT) -find g++)
-       EMBEDDED:=$(shell $(CXX) -E -dM -x c -isysroot $(SDKROOT) -include TargetConditionals.h /dev/null | fgrep TARGET_OS_EMBEDDED | cut -d' ' -f3)
-       ISYSROOT:= -isysroot $(SDKROOT)
+       ifeq "$(BUILD_TYPE)" ""
+               HOSTCC := $(shell xcrun -sdk $(SDKPATH) -find cc)
+               HOSTCXX := $(shell xcrun -sdk $(SDKPATH) -find c++)
+               ifeq "$(SDKPATH)" "/"
+                       ifneq (,$(findstring XcodeDefault,$(HOSTCC)))
+                               HOSTSDKPATH := $(shell xcodebuild -version -sdk macosx Path)
+                       else
+                               HOSTSDKPATH := $(shell xcodebuild -version -sdk macosx.internal Path)
+                       endif
+               else
+                       HOSTSDKPATH := $(SDKPATH)
+               endif
+               ISYSROOT:= -isysroot $(HOSTSDKPATH)
+               CC := $(HOSTCC)
+               CXX := $(HOSTCXX)
+               NM := $(shell xcrun -find nm)
+               STRIPCMD := $(shell xcrun -find strip)
+       else
+               HOSTCC := $(shell xcrun -sdk macosx -find cc)
+               HOSTCXX := $(shell xcrun -sdk macosx -find c++)
+               HOSTSDKPATH := $(shell xcodebuild -version -sdk macosx Path)
+               ISYSROOT:= -isysroot $(SDKPATH)
+               CC := $(shell xcrun -sdk $(SDKPATH) -find cc)
+               CXX := $(shell xcrun -sdk $(SDKPATH) -find c++)
+               NM := $(shell xcrun -sdk $(SDKPATH) -find nm)
+               STRIPCMD := $(shell xcrun -sdk $(SDKPATH) -find strip)
+       endif
+       HOSTISYSROOT = -isysroot $(HOSTSDKPATH)
+       EMBEDDED:=$(shell $(CXX) -E -dM -x c $(ISYSROOT) -include TargetConditionals.h /dev/null | fgrep define' 'TARGET_OS_EMBEDDED | cut -d' ' -f3)
+       WATCHOS:=$(shell $(CXX) -E -dM -x c $(ISYSROOT) -include TargetConditionals.h /dev/null | fgrep define' 'TARGET_OS_WATCH | cut -d' ' -f3)
+       TVOS:=$(shell $(CXX) -E -dM -x c $(ISYSROOT) -include TargetConditionals.h /dev/null | fgrep define' 'TARGET_OS_TV | cut -d' ' -f3)
+       SIMULATOROS:=$(shell $(CXX) -E -dM -x c $(ISYSROOT) -include TargetConditionals.h /dev/null | fgrep define' 'TARGET_OS_SIMULATOR | cut -d' ' -f3)

 endif
 endif

+DSYMTOOL := /usr/bin/dsymutil
+DSYMSUFFIX := .dSYM
+
+$(info # HOSTCC=$(HOSTCC))
+$(info # HOSTCXX=$(HOSTCXX))
+$(info # HOSTISYSROOT=$(HOSTISYSROOT))
+$(info # CC=$(CC))
+$(info # CXX=$(CXX))
+$(info # ISYSROOT=$(ISYSROOT))

 
 ifeq "$(EMBEDDED)" "1"
        export APPLE_EMBEDDED=YES
 
 ifeq "$(EMBEDDED)" "1"
        export APPLE_EMBEDDED=YES


@@ -142,6 +337,27 @@ else
        DISABLE_DRAFT=NO
 endif
 
        DISABLE_DRAFT=NO
 endif
 

+ifeq "$(APPLE_EMBEDDED)" "YES"
+       ifeq "$(WATCHOS)" "1"
+               ICU_TARGET_VERSION := -mwatchos-version-min=$(WATCHOS_VERSION_TARGET_STRING)
+       else ifeq "$(TVOS)" "1"
+               ICU_TARGET_VERSION := -mtvos-version-min=$(TVOS_VERSION_TARGET_STRING)
+       else
+               ICU_TARGET_VERSION := -miphoneos-version-min=$(IOS_VERSION_TARGET_STRING)
+       endif
+else ifeq "$(SIMULATOROS)" "1"
+       ifeq "$(WATCHOS)" "1"
+               ICU_TARGET_VERSION := -mwatchos-simulator-version-min=$(WATCHOS_VERSION_TARGET_STRING)
+       else ifeq "$(TVOS)" "1"
+               ICU_TARGET_VERSION := -mtvos-simulator-version-min=$(TVOS_VERSION_TARGET_STRING)
+       else
+               ICU_TARGET_VERSION := -mios-simulator-version-min=$(IOS_VERSION_TARGET_STRING)
+       endif
+else
+       ICU_TARGET_VERSION := 
+endif
+$(info # ICU_TARGET_VERSION=$(ICU_TARGET_VERSION))
+

 ifeq "$(DISABLE_DRAFT)" "YES"
        DRAFT_FLAG=--disable-draft
 else
 ifeq "$(DISABLE_DRAFT)" "YES"
        DRAFT_FLAG=--disable-draft
 else


@@ -190,6 +406,11 @@ else
        ICU_BUILD := 0
 endif
 $(info # ICU_BUILD=$(ICU_BUILD))
        ICU_BUILD := 0
 endif
 $(info # ICU_BUILD=$(ICU_BUILD))

+ifeq "$(ICU_BUILD)" "0"
+       DEFINE_BUILD_LEVEL = 
+else
+       DEFINE_BUILD_LEVEL =-DU_ICU_VERSION_BUILDLEVEL_NUM=$(ICU_BUILD)
+endif

 
 # Disallow $(SRCROOT) == $(OBJROOT)
 ifeq ($(OBJROOT), $(SRCROOT))
 
 # Disallow $(SRCROOT) == $(OBJROOT)
 ifeq ($(OBJROOT), $(SRCROOT))


@@ -269,7 +490,9 @@ endif
 # Note that installsrc is run on the system from which ICU is submitted, which
 # may be a different environment than the one for a which a build is targeted.
 
 # Note that installsrc is run on the system from which ICU is submitted, which
 # may be a different environment than the one for a which a build is targeted.
 

-INSTALLSRC_VARFILES=./ICU_embedded.order ./minimalapis.txt ./minimalapisTest.c ./minimalpatchconfig.txt ./windowspatchconfig.txt ./patchconfig.txt ./crosshostpatchconfig.txt
+INSTALLSRC_VARFILES=./ICU_embedded.order \
+       ./minimalapis.txt ./minimalapisTest.c ./minimalpatchconfig.txt ./windowspatchconfig.txt ./patchconfig.txt ./crosshostpatchconfig.txt \
+       BuildICUForAAS_script.bat EXPORT.APPLE

 
 #################################
 # Cleaning
 
 #################################
 # Cleaning


@@ -292,9 +515,15 @@ CLEAN_SUBDIR = ./stubdata ./common ./i18n ./io ./layout ./layoutex ./data ./tool
 #################################
 
 ifeq "$(WINDOWS)" "YES"
 #################################
 
 ifeq "$(WINDOWS)" "YES"

-       CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples --disable-icuio \
-               --with-data-packaging=library --prefix=$(PRIVATE_HDR_PREFIX) \
-               $(DRAFT_FLAG)
+       ifeq "$(ARCH64)" "YES"
+               CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples --disable-icuio \
+                       --with-data-packaging=library --prefix=$(PRIVATE_HDR_PREFIX) --with-library-bits=64 \
+                       $(DRAFT_FLAG)
+       else
+               CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples --disable-icuio \
+                       --with-data-packaging=library --prefix=$(PRIVATE_HDR_PREFIX) --with-library-bits=32 \
+                       $(DRAFT_FLAG)
+       endif

 else ifeq "$(LINUX)" "YES"
        ifeq "$(ARCH64)" "YES"
                CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples \
 else ifeq "$(LINUX)" "YES"
        ifeq "$(ARCH64)" "YES"
                CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples \


@@ -308,11 +537,11 @@ else ifeq "$(LINUX)" "YES"
 else ifeq "$(APPLE_EMBEDDED)" "YES"
        CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples --disable-icuio \
                --with-data-packaging=archive --prefix=$(PRIVATE_HDR_PREFIX) \
 else ifeq "$(APPLE_EMBEDDED)" "YES"
        CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples --disable-icuio \
                --with-data-packaging=archive --prefix=$(PRIVATE_HDR_PREFIX) \

-               $(DRAFT_FLAG) --srcdir=$(SRCROOT)/icuSources
+               $(DRAFT_FLAG)

 else
        CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples \
                --with-data-packaging=archive --prefix=$(PRIVATE_HDR_PREFIX) \
 else
        CONFIG_FLAGS = --disable-renaming --disable-extras --disable-layout --disable-samples \
                --with-data-packaging=archive --prefix=$(PRIVATE_HDR_PREFIX) \

-               $(DRAFT_FLAG) --srcdir=$(SRCROOT)/icuSources
+               $(DRAFT_FLAG)

 endif
 
 #################################
 endif
 
 #################################


@@ -327,14 +556,20 @@ endif
 # The ICU version/subversion should reflect the actual ICU version.
 
 LIB_NAME = icucore
 # The ICU version/subversion should reflect the actual ICU version.
 
 LIB_NAME = icucore

-ICU_VERS = 46
+ICU_VERS = 55

 ICU_SUBVERS = 1
 CORE_VERS = A
 
 ifeq "$(WINDOWS)" "YES"
        DYLIB_SUFF = dll
 ICU_SUBVERS = 1
 CORE_VERS = A
 
 ifeq "$(WINDOWS)" "YES"
        DYLIB_SUFF = dll

-       libdir = /AppleInternal/bin/
-       winlibdir = /AppleInternal/lib/
+       ifeq "$(ARCH64)" "YES"
+               winprogdir = /Program\ Files/Common\ Files/Apple/Apple\ Application\ Support/
+               winintlibdir = /AppleInternal/lib64/
+       else
+               winprogdir = /Program\ Files\ \(x86\)/Common\ Files/Apple/Apple\ Application\ Support/
+               winintlibdir = /AppleInternal/lib32/
+       endif
+       libdir =

 else ifeq "$(LINUX)" "YES"
        DYLIB_SUFF = so
        ifeq "$(ARCH64)" "YES"
 else ifeq "$(LINUX)" "YES"
        DYLIB_SUFF = so
        ifeq "$(ARCH64)" "YES"


@@ -342,11 +577,13 @@ else ifeq "$(LINUX)" "YES"
        else
                libdir = /usr/lib/
        endif
        else
                libdir = /usr/lib/
        endif

-       winlibdir =
+       winprogdir =
+       winintlibdir =

 else
        DYLIB_SUFF = dylib
        libdir = /usr/lib/
 else
        DYLIB_SUFF = dylib
        libdir = /usr/lib/

-       winlibdir =
+       winprogdir =
+       winintlibdir =

 endif
 
 DYLIB = lib$(LIB_NAME).$(DYLIB_SUFF)
 endif
 
 DYLIB = lib$(LIB_NAME).$(DYLIB_SUFF)


@@ -377,12 +614,33 @@ DYLIB_profile = DYLIB_PROFILE
 # Data files
 #################################
 
 # Data files
 #################################
 

-datadir=/usr/share/icu/

 OPEN_SOURCE_VERSIONS_DIR=/usr/local/OpenSourceVersions/
 OPEN_SOURCE_LICENSES_DIR=/usr/local/OpenSourceLicenses/
 OPEN_SOURCE_VERSIONS_DIR=/usr/local/OpenSourceVersions/
 OPEN_SOURCE_LICENSES_DIR=/usr/local/OpenSourceLicenses/

-ICU_DATA_DIR= data/out
+

 B_DATA_FILE=icudt$(ICU_VERS)b.dat
 L_DATA_FILE=icudt$(ICU_VERS)l.dat
 B_DATA_FILE=icudt$(ICU_VERS)b.dat
 L_DATA_FILE=icudt$(ICU_VERS)l.dat

+DATA_BUILD_SUBDIR= data/out
+DATA_INSTALL_DIR=/usr/share/icu/
+# DATA_LOOKUP_DIR is what the target ICU_DATA_DIR gets set to in CFLAGS, CXXFLAGS;
+# DATA_LOOKUP_DIR_BUILDHOST is what any crossbuild host ICU_DATA_DIR gets set to.
+ifneq "$(APPLE_EMBEDDED)" "YES"
+       DATA_LOOKUP_DIR=/usr/share/icu/
+else
+       ifeq "$(RC_INDIGO)" "YES"
+               DATA_LOOKUP_DIR=/usr/share/icu/
+       else
+               DATA_LOOKUP_DIR=/var/db/icu/
+       endif
+endif
+DATA_LOOKUP_DIR_BUILDHOST=/usr/share/icu/
+
+# Name of runtime environment variable to get the prefix path for DATA_LOOKUP_DIR
+# Currently we are only using this for LINUX, should also use for iOS simulator
+ifeq "$(LINUX)" "YES"
+       DATA_DIR_PREFIX_ENV_VAR=APPLE_FRAMEWORKS_ROOT
+else
+       DATA_DIR_PREFIX_ENV_VAR=
+endif

 
 #################################
 # Info tool
 
 #################################
 # Info tool


@@ -394,6 +652,16 @@ INFOTOOL = icuinfo
 
 INFOTOOL_OBJS = ./tools/icuinfo/icuinfo.o ./tools/toolutil/udbgutil.o ./tools/toolutil/uoptions.o
 
 
 INFOTOOL_OBJS = ./tools/icuinfo/icuinfo.o ./tools/toolutil/udbgutil.o ./tools/toolutil/uoptions.o
 

+#################################
+# CLDR file(s)
+# e.g. supplementalData.xml, per <rdar://problem/13426014>
+# These are like internal headers in that they are only installed for
+# (other) projects to build against, not needed at runtime.
+# Therefore install during installhdrs.
+#################################
+
+CLDRFILESDIR=/usr/local/share/cldr
+

 #################################
 # Environment variables
 #################################
 #################################
 # Environment variables
 #################################


@@ -404,155 +672,152 @@ INFOTOOL_OBJS = ./tools/icuinfo/icuinfo.o ./tools/toolutil/udbgutil.o ./tools/to
 # into CFLAGS (and CXXFLAGS). This controls a lot of the external variables so we don't
 # need to directly modify the ICU files (like for CFLAGS, etc).
 
 # into CFLAGS (and CXXFLAGS). This controls a lot of the external variables so we don't
 # need to directly modify the ICU files (like for CFLAGS, etc).
 

-LIBOVERRIDES=LIBICUDT="-L$(OBJROOT) -l$(LIB_NAME)" \
-       LIBICUUC="-L$(OBJROOT) -l$(LIB_NAME)" \
-       LIBICUI18N="-L$(OBJROOT) -l$(LIB_NAME)"
+LIBOVERRIDES=LIBICUDT="-L$(OBJROOT_CURRENT) -l$(LIB_NAME)" \
+       LIBICUUC="-L$(OBJROOT_CURRENT) -l$(LIB_NAME)" \
+       LIBICUI18N="-L$(OBJROOT_CURRENT) -l$(LIB_NAME)"

 
 # For normal Windows builds set the ENV= options here; for debug Windows builds set the ENV_DEBUG=
 # options here and also the update the LINK.EXE lines in the TARGETS section below.
 ifeq "$(WINDOWS)" "YES"
 
 # For normal Windows builds set the ENV= options here; for debug Windows builds set the ENV_DEBUG=
 # options here and also the update the LINK.EXE lines in the TARGETS section below.
 ifeq "$(WINDOWS)" "YES"

-       export TZ_EXTRA_CXXFLAGS:=
-       ifeq "$(ICU_BUILD)" "0"
-               CPPOPTIONS = CPPFLAGS="-DU_DISABLE_RENAMING=1"
+       ifeq "$(ARCH64)" "YES"
+               ENV= CFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
+                       CXXFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t" \
+                       LDFLAGS="/NXCOMPAT /DYNAMICBASE /DEBUG /OPT:REF"

        else
        else

-               CPPOPTIONS = CPPFLAGS="-DU_DISABLE_RENAMING=1 -DU_ICU_VERSION_BUILDLEVEL_NUM=$(ICU_BUILD)"
+               ENV= CFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
+                       CXXFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t" \
+                       LDFLAGS="/NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF"

        endif
        endif

-       ENV= CFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" CXXFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t" LDFLAGS="/NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF"
-       ENV_CONFIGURE= $(CPPOPTIONS) CFLAGS="/O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" CXXFLAGS="/O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t"
-       ENV_DEBUG= CFLAGS="/O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" CXXFLAGS="/O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc" LDFLAGS="/DEBUG /DYNAMICBASE"
+       ENV_CONFIGURE= CPPFLAGS="-DU_DISABLE_RENAMING=1 $(DEFINE_BUILD_LEVEL)" \
+               CFLAGS="/O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
+               CXXFLAGS="/O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t"
+       ENV_DEBUG= CFLAGS="/O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
+               CXXFLAGS="/O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc" \
+               LDFLAGS="/DEBUG /DYNAMICBASE"

        ENV_PROFILE=
 else ifeq "$(LINUX)" "YES"
        ENV_PROFILE=
 else ifeq "$(LINUX)" "YES"

-       export TZ_EXTRA_CXXFLAGS:=
-       ifeq "$(ICU_BUILD)" "0"
-               CPPOPTIONS = CPPFLAGS="-DU_DISABLE_RENAMING=1"
-       else
-               CPPOPTIONS = CPPFLAGS="-DU_DISABLE_RENAMING=1 -DU_ICU_VERSION_BUILDLEVEL_NUM=$(ICU_BUILD)"
-       endif

        ifeq "$(ARCH64)" "YES"
        ifeq "$(ARCH64)" "YES"

-               ENV_CONFIGURE=  $(CPPOPTIONS) APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               ENV_CONFIGURE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+                       CPPFLAGS="-DU_DISABLE_RENAMING=1 $(DEFINE_BUILD_LEVEL)"  \

                        CC="$(CC)" \
                        CXX="$(CXX)" \
                        CC="$(CC)" \
                        CXX="$(CXX)" \

-                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m64 -g -Os -fno-exceptions -fvisibility=hidden" \
-                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m64 -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
+                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m64 -g -Os -fno-exceptions -fvisibility=hidden" \
+                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m64 -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                        TZDATA="$(TZDATA)" \
                        TZDATA="$(TZDATA)" \

-                       DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib64"
-               
-               ENV=    APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+                       DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib64"
+
+               ENV= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                        CC="$(CC)" \
                        CXX="$(CXX)" \
                        CC="$(CC)" \
                        CXX="$(CXX)" \

-                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m64 -g -Os -fno-exceptions -fvisibility=hidden" \
-                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m64 -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
+                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m64 -g -Os -fno-exceptions -fvisibility=hidden" \
+                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m64 -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                        TZDATA="$(TZDATA)" \
                        TZDATA="$(TZDATA)" \

-                       DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib64"
-                       
-               ENV_DEBUG = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+                       DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib64"
+
+               ENV_DEBUG= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                        CC="$(CC)" \
                        CXX="$(CXX)" \
                        CC="$(CC)" \
                        CXX="$(CXX)" \

-                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m64 -O0 -gfull -fno-exceptions -fvisibility=hidden" \
-                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m64 -O0 -gfull -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
+                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m64 -O0 -gfull -fno-exceptions -fvisibility=hidden" \
+                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m64 -O0 -gfull -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                        TZDATA="$(TZDATA)" \
                        TZDATA="$(TZDATA)" \

-                       DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib64"
+                       DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib64"

                
                

-               ENV_PROFILE = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               ENV_PROFILE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                        CC="$(CC)" \
                        CXX="$(CXX)" \
                        CC="$(CC)" \
                        CXX="$(CXX)" \

-                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m64 -g -Os -pg -fno-exceptions -fvisibility=hidden" \
-                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m64 -g -Os -pg -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
+                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m64 -g -Os -pg -fno-exceptions -fvisibility=hidden" \
+                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m64 -g -Os -pg -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                        TZDATA="$(TZDATA)" \
                        TZDATA="$(TZDATA)" \

-                       DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib64"
+                       DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib64"

        else
        else

-               ENV_CONFIGURE=  $(CPPOPTIONS) APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               ENV_CONFIGURE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+                       CPPFLAGS="-DU_DISABLE_RENAMING=1 $(DEFINE_BUILD_LEVEL)" \

                        CC="$(CC)" \
                        CXX="$(CXX)" \
                        CC="$(CC)" \
                        CXX="$(CXX)" \

-                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m32 -g -Os -fno-exceptions -fvisibility=hidden" \
-                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m32 -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
+                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m32 -g -Os -fno-exceptions -fvisibility=hidden" \
+                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m32 -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                        TZDATA="$(TZDATA)" \
                        TZDATA="$(TZDATA)" \

-                       DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+                       DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

                
                

-               ENV=    APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               ENV= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                        CC="$(CC)" \
                        CXX="$(CXX)" \
                        CC="$(CC)" \
                        CXX="$(CXX)" \

-                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m32 -g -Os -fno-exceptions -fvisibility=hidden" \
-                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m32 -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
+                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m32 -g -Os -fno-exceptions -fvisibility=hidden" \
+                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m32 -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                        TZDATA="$(TZDATA)" \
                        TZDATA="$(TZDATA)" \

-                       DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+                       DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

                        
                        

-               ENV_DEBUG = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               ENV_DEBUG= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                        CC="$(CC)" \
                        CXX="$(CXX)" \
                        CC="$(CC)" \
                        CXX="$(CXX)" \

-                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m32 -O0 -gfull -fno-exceptions -fvisibility=hidden" \
-                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m32 -O0 -gfull -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
+                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m32 -O0 -gfull -fno-exceptions -fvisibility=hidden" \
+                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m32 -O0 -gfull -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                        TZDATA="$(TZDATA)" \
                        TZDATA="$(TZDATA)" \

-                       DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+                       DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

                
                

-               ENV_PROFILE = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               ENV_PROFILE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                        CC="$(CC)" \
                        CXX="$(CXX)" \
                        CC="$(CC)" \
                        CXX="$(CXX)" \

-                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m32 -g -Os -pg -fno-exceptions -fvisibility=hidden" \
-                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -m32 -g -Os -pg -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
+                       CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m32 -g -Os -pg -fno-exceptions -fvisibility=hidden" \
+                       CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" -DICU_DATA_DIR_PREFIX_ENV_VAR=\"\\\"$(DATA_DIR_PREFIX_ENV_VAR)\\\"\" -m32 -g -Os -pg -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                        TZDATA="$(TZDATA)" \
                        TZDATA="$(TZDATA)" \

-                       DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+                       DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

        endif
 else
        endif
 else

-       export TZ_EXTRA_CXXFLAGS:=-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) $(SET_MACOSX_MIN_VER)
-       ifeq "$(ICU_BUILD)" "0"
-               CPPOPTIONS = CPPFLAGS="-DSTD_INSPIRED -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED)"
-       else
-               CPPOPTIONS = CPPFLAGS="-DU_ICU_VERSION_BUILDLEVEL_NUM=$(ICU_BUILD) -DSTD_INSPIRED -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED)"
-       endif
-       ENV_CONFIGURE=  $(CPPOPTIONS) APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+       CPPOPTIONS = 
+       ENV_CONFIGURE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               CPPFLAGS="$(DEFINE_BUILD_LEVEL) -DSTD_INSPIRED -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) $(ISYSROOT) $(ENV_CONFIGURE_ARCHS)" \

                CC="$(CC)" \
                CXX="$(CXX)" \
                CC="$(CC)" \
                CXX="$(CXX)" \

-               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(ENV_CONFIGURE_ARCHS) $(SET_MACOSX_MIN_VER) -g -Os -fno-exceptions -fvisibility=hidden $(ISYSROOT) $(THUMB_FLAG)" \
-               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(ENV_CONFIGURE_ARCHS) $(SET_MACOSX_MIN_VER) -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG)" \
-               TZ_EXTRA_CXXFLAGS="$(TZ_EXTRA_CXXFLAGS)" \
+               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" $(ENV_CONFIGURE_ARCHS) $(ICU_TARGET_VERSION) -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden $(ISYSROOT) $(THUMB_FLAG)" \
+               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" $(ENV_CONFIGURE_ARCHS) $(ICU_TARGET_VERSION) -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG)" \

                RC_ARCHS="$(RC_ARCHS)" $(FORCEENDIAN)\
                TZDATA="$(TZDATA)" \
                RC_ARCHS="$(RC_ARCHS)" $(FORCEENDIAN)\
                TZDATA="$(TZDATA)" \

-               DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+               DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

        
        

-       ENV=    APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+       ENV= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                CC="$(CC)" \
                CXX="$(CXX)" \
                CC="$(CC)" \
                CXX="$(CXX)" \

-               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) $(SET_MACOSX_MIN_VER) -g -Os -fno-exceptions -fvisibility=hidden $(ISYSROOT) $(THUMB_FLAG)" \
-               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) $(SET_MACOSX_MIN_VER) -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG)" \
-               TZ_EXTRA_CXXFLAGS="$(TZ_EXTRA_CXXFLAGS)" \
+               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" $(RC_ARCHS:%=-arch %) $(ICU_TARGET_VERSION) -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden $(ISYSROOT) $(THUMB_FLAG)" \
+               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" $(RC_ARCHS:%=-arch %) $(ICU_TARGET_VERSION) -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG)" \

                RC_ARCHS="$(RC_ARCHS)" \
                TZDATA="$(TZDATA)" \
                RC_ARCHS="$(RC_ARCHS)" \
                TZDATA="$(TZDATA)" \

-               DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+               DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

                
                

-       ENV_DEBUG = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+       ENV_DEBUG= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                CC="$(CC)" \
                CXX="$(CXX)" \
                CC="$(CC)" \
                CXX="$(CXX)" \

-               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) $(SET_MACOSX_MIN_VER) -O0 -gfull -fno-exceptions -fvisibility=hidden $(ISYSROOT) $(THUMB_FLAG)" \
-               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) $(SET_MACOSX_MIN_VER) -O0 -gfull -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG)" \
-               TZ_EXTRA_CXXFLAGS="$(TZ_EXTRA_CXXFLAGS)" \
+               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" $(RC_ARCHS:%=-arch %) $(ICU_TARGET_VERSION) -O0 -gfull -Wglobal-constructors -fno-exceptions -fvisibility=hidden $(ISYSROOT) $(THUMB_FLAG)" \
+               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" $(RC_ARCHS:%=-arch %) $(ICU_TARGET_VERSION) -O0 -gfull -Wglobal-constructors -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG)" \

                RC_ARCHS="$(RC_ARCHS)" \
                TZDATA="$(TZDATA)" \
                RC_ARCHS="$(RC_ARCHS)" \
                TZDATA="$(TZDATA)" \

-               DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+               DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

        
        

-       ENV_PROFILE = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+       ENV_PROFILE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \

                CC="$(CC)" \
                CXX="$(CXX)" \
                CC="$(CC)" \
                CXX="$(CXX)" \

-               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) $(SET_MACOSX_MIN_VER) -g -Os -pg -fno-exceptions -fvisibility=hidden $(ISYSROOT) $(THUMB_FLAG)" \
-               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) $(SET_MACOSX_MIN_VER) -g -Os -pg -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG)" \
-               TZ_EXTRA_CXXFLAGS="$(TZ_EXTRA_CXXFLAGS)" \
+               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" $(RC_ARCHS:%=-arch %) $(ICU_TARGET_VERSION) -g -Os -pg -Wglobal-constructors -fno-exceptions -fvisibility=hidden $(ISYSROOT) $(THUMB_FLAG)" \
+               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR)\\\"\" $(RC_ARCHS:%=-arch %) $(ICU_TARGET_VERSION) -g -Os -pg -Wglobal-constructors -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG)" \

                RC_ARCHS="$(RC_ARCHS)" \
                TZDATA="$(TZDATA)" \
                RC_ARCHS="$(RC_ARCHS)" \
                TZDATA="$(TZDATA)" \

-               DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
-
-       ENV_CONFIGURE_BUILDHOST =       $(CPPOPTIONS) APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
-               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -mmacosx-version-min=$(MAC_OS_X_VERSION_MIN_STRING) -g -Os -fno-exceptions -fvisibility=hidden" \
-               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -mmacosx-version-min=$(MAC_OS_X_VERSION_MIN_STRING) -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
-               TZ_EXTRA_CXXFLAGS="$(TZ_EXTRA_CXXFLAGS)" \
+               DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"
+
+       ENV_CONFIGURE_BUILDHOST= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               CPPFLAGS="$(DEFINE_BUILD_LEVEL) -DSTD_INSPIRED -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) $(HOSTISYSROOT)" \
+               CC="$(HOSTCC)" \
+               CXX="$(HOSTCXX)" \
+               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR_BUILDHOST)\\\"\" -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -mmacosx-version-min=$(OSX_HOST_VERSION_MIN_STRING) $(HOSTISYSROOT) -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden" \
+               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR_BUILDHOST)\\\"\" -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -mmacosx-version-min=$(OSX_HOST_VERSION_MIN_STRING) $(HOSTISYSROOT) -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                TZDATA="$(TZDATA)" \
                TZDATA="$(TZDATA)" \

-               DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+               DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

        
        

-       ENV_BUILDHOST = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
-               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -mmacosx-version-min=$(MAC_OS_X_VERSION_MIN_STRING) -g -Os -fno-exceptions -fvisibility=hidden" \
-               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -mmacosx-version-min=$(MAC_OS_X_VERSION_MIN_STRING) -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \
-               TZ_EXTRA_CXXFLAGS="$(TZ_EXTRA_CXXFLAGS)" \
+       ENV_BUILDHOST= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
+               CC="$(HOSTCC)" \
+               CXX="$(HOSTCXX)" \
+               CFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR_BUILDHOST)\\\"\" -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -mmacosx-version-min=$(OSX_HOST_VERSION_MIN_STRING) $(HOSTISYSROOT) -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden" \
+               CXXFLAGS="-DU_SHOW_CPLUSPLUS_API=1 -DU_SHOW_INTERNAL_API=1 -DU_TIMEZONE=timezone -DICU_DATA_DIR=\"\\\"$(DATA_LOOKUP_DIR_BUILDHOST)\\\"\" -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -mmacosx-version-min=$(OSX_HOST_VERSION_MIN_STRING) $(HOSTISYSROOT) -g -Os -Wglobal-constructors -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden" \

                TZDATA="$(TZDATA)" \
                TZDATA="$(TZDATA)" \

-               DYLD_LIBRARY_PATH="$(DEST_ROOT)/usr/local/lib"
+               DYLD_LIBRARY_PATH="$(DEST_ROOT)usr/local/lib"

 
 endif
        
 
 endif
        


@@ -560,7 +825,9 @@ ENV_icu = ENV
 ENV_debug = ENV_DEBUG
 ENV_profile = ENV_PROFILE
 
 ENV_debug = ENV_DEBUG
 ENV_profile = ENV_PROFILE
 

-ifeq "$(APPLE_EMBEDDED)" "YES"
+ifeq "$(BUILD_TYPE)" "DEVICE"
+       ORDERFILE=$(SDKPATH)/AppleInternal/OrderFiles/libicucore.order
+else ifeq "$(APPLE_EMBEDDED)" "YES"

        ORDERFILE=$(SRCROOT)/ICU_embedded.order
 else
        ORDERFILE=/usr/local/lib/OrderFiles/libicucore.order
        ORDERFILE=$(SRCROOT)/ICU_embedded.order
 else
        ORDERFILE=/usr/local/lib/OrderFiles/libicucore.order


@@ -581,8 +848,9 @@ endif
 .PHONY : icu check installsrc installhdrs installhdrsint clean install debug debug-install crossbuildhost
 .DELETE_ON_ERROR :
 
 .PHONY : icu check installsrc installhdrs installhdrsint clean install debug debug-install crossbuildhost
 .DELETE_ON_ERROR :
 

-icu debug profile : $(OBJROOT)/Makefile
-       (cd $(OBJROOT); \
+icu debug profile : $(OBJROOT_CURRENT)/Makefile
+       echo "# make for target";
+       (cd $(OBJROOT_CURRENT); \

                $(MAKE) $($(ENV_$@)); \
                if test "$(WINDOWS)" = "YES"; then \
                        (cd common; \
                $(MAKE) $($(ENV_$@)); \
                if test "$(WINDOWS)" = "YES"; then \
                        (cd common; \


@@ -604,47 +872,65 @@ icu debug profile : $(OBJROOT)/Makefile
                                                *.o libicuin.res ../lib/libicuuc_$@.lib ../stubdata/icudt.lib advapi32.lib; \
                                ); \
                        else \
                                                *.o libicuin.res ../lib/libicuuc_$@.lib ../stubdata/icudt.lib advapi32.lib; \
                                ); \
                        else \

-                               mkdir -p lib/shim; \

                                (cd common; \
                                (cd common; \

-                                       rm -f icuuc40shim.o; \

                                        rm -f ../lib/libicuuc.dll.manifest; \
                                        rm -f ../lib/libicuuc.dll.manifest; \

-                                       rm -f ../lib/icuuc40.dll.manifest; \
-                                       LINK.EXE /DLL /NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF \
-                                               /IMPLIB:../lib/libicuuc.lib /out:../lib/libicuuc.dll \
-                                               *.o libicuuc.res ../stubdata/icudt.lib advapi32.lib; \
+                                       if test "$(ARCH64)" = "YES"; then \
+                                               LINK.EXE /DLL /NXCOMPAT /DYNAMICBASE /DEBUG /OPT:REF /MANIFEST \
+                                                       /IMPLIB:../lib/libicuuc.lib /out:../lib/libicuuc.dll \
+                                                       *.o libicuuc.res ../stubdata/icudt.lib advapi32.lib; \
+                                       else \
+                                               LINK.EXE /DLL /NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF /MANIFEST \
+                                                       /IMPLIB:../lib/libicuuc.lib /out:../lib/libicuuc.dll \
+                                                       *.o libicuuc.res ../stubdata/icudt.lib advapi32.lib; \
+                                       fi; \

                                        mt.exe -nologo -manifest ../lib/libicuuc.dll.manifest -outputresource:"../lib/libicuuc.dll;2"; \
                                        mt.exe -nologo -manifest ../lib/libicuuc.dll.manifest -outputresource:"../lib/libicuuc.dll;2"; \

-                                       cl -DU_DISABLE_RENAMING=1 -DU_ICU_VERSION_BUILDLEVEL_NUM=$(ICU_BUILD) \
-                                               -DU_RELEASE=1 -D_CRT_SECURE_NO_DEPRECATE -I. -I../i18n \
-                                               -DU_LOCAL_SERVICE_HOOK=1 -DWIN32 -DU_COMMON_IMPLEMENTATION \
-                                               /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t \
-                                               /c /Foicuuc40shim.o icuuc40shim.cpp; \
-                                       rc.exe /foicuuc40shim.res $(CPPFLAGS) -DU_RELEASE=1 -D_CRT_SECURE_NO_DEPRECATE -I. -I../i18n \
-                                               "-DDEFAULT_ICU_PLUGINS=\"/AppleInternal/lib/icu\" " -DU_LOCAL_SERVICE_HOOK=1 icuuc40shim.rc; \
-                                       LINK.EXE /DLL /NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF \
-                                               /IMPLIB:../lib/shim/icuuc.lib /out:../lib/icuuc40.dll \
-                                               icuuc40shim.o icuuc40shim.res ../lib/libicuuc.lib ../stubdata/icudt.lib advapi32.lib; \
-                                       mt.exe -nologo -manifest ../lib/icuuc40.dll.manifest -outputresource:"../lib/icuuc40.dll;2"; \

                                ); \
                                (cd i18n; \
                                ); \
                                (cd i18n; \

-                                       rm -f icuin40shim.o; \

                                        rm -f ../lib/libicuin.dll.manifest; \
                                        rm -f ../lib/libicuin.dll.manifest; \

-                                       rm -f ../lib/icuin40.dll.manifest; \
-                                       LINK.EXE /DLL /NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF \
-                                               /IMPLIB:../lib/libicuin.lib /out:../lib/libicuin.dll \
-                                               *.o libicuin.res ../lib/libicuuc.lib ../stubdata/icudt.lib advapi32.lib; \
+                                       if test "$(ARCH64)" = "YES"; then \
+                                               LINK.EXE /DLL /NXCOMPAT /DYNAMICBASE /DEBUG /OPT:REF /MANIFEST \
+                                                       /IMPLIB:../lib/libicuin.lib /out:../lib/libicuin.dll \
+                                                       *.o libicuin.res ../lib/libicuuc.lib ../stubdata/icudt.lib advapi32.lib; \
+                                       else \
+                                               LINK.EXE /DLL /NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF /MANIFEST \
+                                                       /IMPLIB:../lib/libicuin.lib /out:../lib/libicuin.dll \
+                                                       *.o libicuin.res ../lib/libicuuc.lib ../stubdata/icudt.lib advapi32.lib; \
+                                       fi; \

                                        mt.exe -nologo -manifest ../lib/libicuin.dll.manifest -outputresource:"../lib/libicuin.dll;2"; \
                                        mt.exe -nologo -manifest ../lib/libicuin.dll.manifest -outputresource:"../lib/libicuin.dll;2"; \

-                                       cl -DU_DISABLE_RENAMING=1 -DU_ICU_VERSION_BUILDLEVEL_NUM=$(ICU_BUILD) \
-                                               -DU_RELEASE=1 -D_CRT_SECURE_NO_DEPRECATE -I. -I../common \
-                                               -DU_LOCAL_SERVICE_HOOK=1 -DWIN32 -DU_I18N_IMPLEMENTATION \
-                                               /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t \
-                                               /c /Foicuin40shim.o icuin40shim.cpp; \
-                                       rc.exe /foicuin40shim.res $(CPPFLAGS) -DU_RELEASE=1 -D_CRT_SECURE_NO_DEPRECATE -I. -I../common \
-                                               "-DDEFAULT_ICU_PLUGINS=\"/AppleInternal/lib/icu\" " -DU_LOCAL_SERVICE_HOOK=1 icuin40shim.rc; \
-                                       LINK.EXE /DLL /NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF \
-                                               /IMPLIB:../lib/shim/icuin.lib /out:../lib/icuin40.dll \
-                                               icuin40shim.o icuin40shim.res ../lib/libicuin.lib ../stubdata/icudt.lib advapi32.lib; \
-                                       mt.exe -nologo -manifest ../lib/icuin40.dll.manifest -outputresource:"../lib/icuin40.dll;2"; \

                                ); \
                                ); \

+                               if test "$(ARCH64)" != "YES"; then \
+                                       mkdir -p lib/shim; \
+                                       (cd common; \
+                                               rm -f icuuc40shim.o; \
+                                               rm -f ../lib/icuuc40.dll.manifest; \
+                                               cl -DU_DISABLE_RENAMING=1 -DU_ICU_VERSION_BUILDLEVEL_NUM=$(ICU_BUILD) \
+                                                       -DU_RELEASE=1 -D_CRT_SECURE_NO_DEPRECATE -I. -I../i18n \
+                                                       -DU_LOCAL_SERVICE_HOOK=1 -DWIN32 -DU_COMMON_IMPLEMENTATION \
+                                                       /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t \
+                                                       /c /Foicuuc40shim.o icuuc40shim.cpp; \
+                                               rc.exe /foicuuc40shim.res $(CPPFLAGS) -DU_RELEASE=1 -D_CRT_SECURE_NO_DEPRECATE -I. -I../i18n \
+                                                       "-DDEFAULT_ICU_PLUGINS=\"/AppleInternal/lib/icu\" " -DU_LOCAL_SERVICE_HOOK=1 icuuc40shim.rc; \
+                                               LINK.EXE /DLL /NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF /MANIFEST \
+                                                       /IMPLIB:../lib/shim/icuuc.lib /out:../lib/icuuc40.dll \
+                                                       icuuc40shim.o icuuc40shim.res ../lib/libicuuc.lib ../stubdata/icudt.lib advapi32.lib; \
+                                               mt.exe -nologo -manifest ../lib/icuuc40.dll.manifest -outputresource:"../lib/icuuc40.dll;2"; \
+                                       ); \
+                                       (cd i18n; \
+                                               rm -f icuin40shim.o; \
+                                               rm -f ../lib/icuin40.dll.manifest; \
+                                               cl -DU_DISABLE_RENAMING=1 -DU_ICU_VERSION_BUILDLEVEL_NUM=$(ICU_BUILD) \
+                                                       -DU_RELEASE=1 -D_CRT_SECURE_NO_DEPRECATE -I. -I../common \
+                                                       -DU_LOCAL_SERVICE_HOOK=1 -DWIN32 -DU_I18N_IMPLEMENTATION \
+                                                       /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t \
+                                                       /c /Foicuin40shim.o icuin40shim.cpp; \
+                                               rc.exe /foicuin40shim.res $(CPPFLAGS) -DU_RELEASE=1 -D_CRT_SECURE_NO_DEPRECATE -I. -I../common \
+                                                       "-DDEFAULT_ICU_PLUGINS=\"/AppleInternal/lib/icu\" " -DU_LOCAL_SERVICE_HOOK=1 icuin40shim.rc; \
+                                               LINK.EXE /DLL /NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF /MANIFEST \
+                                                       /IMPLIB:../lib/shim/icuin.lib /out:../lib/icuin40.dll \
+                                                       icuin40shim.o icuin40shim.res ../lib/libicuin.lib ../stubdata/icudt.lib advapi32.lib; \
+                                               mt.exe -nologo -manifest ../lib/icuin40.dll.manifest -outputresource:"../lib/icuin40.dll;2"; \
+                                       ); \
+                               fi; \

                        fi; \
                else \
                        if test "$(LINUX)" = "YES"; then \
                        fi; \
                else \
                        if test "$(LINUX)" = "YES"; then \


@@ -661,38 +947,39 @@ icu debug profile : $(OBJROOT)/Makefile
                                fi; \
                        else \
                                tmpfile=`mktemp -t weakexternal.XXXXXX` || exit 1; \
                                fi; \
                        else \
                                tmpfile=`mktemp -t weakexternal.XXXXXX` || exit 1; \

-                               nm -m $(RC_ARCHS:%=-arch %) $(DYLIB_OBJS) | fgrep "weak external" | fgrep -v "undefined" | sed -e 's/.*weak external[^_]*//' | sort | uniq | cat >$$tmpfile; \
+                               $(NM) -m $(RC_ARCHS:%=-arch %) $(DYLIB_OBJS) | fgrep "weak external" | fgrep -v "undefined" | sed -e 's/.*weak external[^_]*//' | sort | uniq | cat >$$tmpfile; \

                                $($(ENV_$@)) $(CXX) -current_version $(ICU_VERS).$(ICU_SUBVERS) -compatibility_version 1 -dynamiclib -dynamic \
                                $($(ENV_$@)) $(CXX) -current_version $(ICU_VERS).$(ICU_SUBVERS) -compatibility_version 1 -dynamiclib -dynamic \

-                                       $(RC_ARCHS:%=-arch %) $(SET_MACOSX_MIN_VER) -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG) \
+                                       $(RC_ARCHS:%=-arch %) $(ICU_TARGET_VERSION) -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG) \

                                        $(CXXFLAGS) $(LDFLAGS) -single_module $(SECTORDER_FLAGS) -unexported_symbols_list $$tmpfile -dead_strip \
                                        -install_name $(libdir)$($(INSTALLED_DYLIB_$@)) -o ./$($(INSTALLED_DYLIB_$@)) $(DYLIB_OBJS); \
                                if test "$@" = "icu"; then \
                                        ln -fs  $(INSTALLED_DYLIB) $(DYLIB); \
                                        $($(ENV_$@)) $(CXX) $(RC_ARCHS:%=-arch %) -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG) \
                                        $(CXXFLAGS) $(LDFLAGS) -single_module $(SECTORDER_FLAGS) -unexported_symbols_list $$tmpfile -dead_strip \
                                        -install_name $(libdir)$($(INSTALLED_DYLIB_$@)) -o ./$($(INSTALLED_DYLIB_$@)) $(DYLIB_OBJS); \
                                if test "$@" = "icu"; then \
                                        ln -fs  $(INSTALLED_DYLIB) $(DYLIB); \
                                        $($(ENV_$@)) $(CXX) $(RC_ARCHS:%=-arch %) -g -Os -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden $(ISYSROOT) $(THUMB_FLAG) \

-                                               $(LDFLAGS) -Wl,-S -Wl,-x -dead_strip -o ./$(INFOTOOL) $(INFOTOOL_OBJS) -L./ -l$(LIB_NAME) ; \
+                                               $(LDFLAGS) -dead_strip -o ./$(INFOTOOL) $(INFOTOOL_OBJS) -L./ -l$(LIB_NAME) ; \

                                fi; \
                        fi; \
                                fi; \
                        fi; \

-                       if test -f ./$(ICU_DATA_DIR)/$(B_DATA_FILE); then \
-                               ln -fs ./$(ICU_DATA_DIR)/$(B_DATA_FILE); \
+                       if test -f ./$(DATA_BUILD_SUBDIR)/$(B_DATA_FILE); then \
+                               ln -fs ./$(DATA_BUILD_SUBDIR)/$(B_DATA_FILE); \

                        fi; \
                        fi; \

-                       if test -f ./$(ICU_DATA_DIR)/$(L_DATA_FILE); then \
-                               ln -fs ./$(ICU_DATA_DIR)/$(L_DATA_FILE); \
+                       if test -f ./$(DATA_BUILD_SUBDIR)/$(L_DATA_FILE); then \
+                               ln -fs ./$(DATA_BUILD_SUBDIR)/$(L_DATA_FILE); \

                        else \
                                DYLD_LIBRARY_PATH=$(ICUPKGTOOLIBS) \
                        else \
                                DYLD_LIBRARY_PATH=$(ICUPKGTOOLIBS) \

-                               $(ICUPKGTOOL) -tl ./$(ICU_DATA_DIR)/$(B_DATA_FILE) $(L_DATA_FILE); \
+                               $(ICUPKGTOOL) -tl ./$(DATA_BUILD_SUBDIR)/$(B_DATA_FILE) $(L_DATA_FILE); \

                        fi; \
                fi; \
        );
 
 crossbuildhost : $(CROSSHOST_OBJROOT)/Makefile
                        fi; \
                fi; \
        );
 
 crossbuildhost : $(CROSSHOST_OBJROOT)/Makefile

+       echo "# make for crossbuild host";

        (cd $(CROSSHOST_OBJROOT); \
                $(MAKE) $($(ENV_BUILDHOST)); \
        );
 
 check : icu
 ifneq "$(CROSS_BUILD)" "YES"
        (cd $(CROSSHOST_OBJROOT); \
                $(MAKE) $($(ENV_BUILDHOST)); \
        );
 
 check : icu
 ifneq "$(CROSS_BUILD)" "YES"

-       (cd $(OBJROOT); \
-               ICU_DATA=$(OBJROOT) $(MAKE) $(ENV) check; \
+       (cd $(OBJROOT_CURRENT); \
+               ICU_DATA=$(OBJROOT_CURRENT) $(MAKE) $(ENV) check; \

        );
 else
        $(warning check not supported for cross-build)
        );
 else
        $(warning check not supported for cross-build)


@@ -700,71 +987,58 @@ endif
 
 check-debug: debug
 ifneq "$(CROSS_BUILD)" "YES"
 
 check-debug: debug
 ifneq "$(CROSS_BUILD)" "YES"

-       (cd $(OBJROOT); \
-               ICU_DATA=$(OBJROOT) $(MAKE) $(ENV_DEBUG) check; \
+       (cd $(OBJROOT_CURRENT); \
+               ICU_DATA=$(OBJROOT_CURRENT) $(MAKE) $(ENV_DEBUG) check; \

        );
 else
        $(warning check not supported for cross-build)
 endif
 
 samples: icu
        );
 else
        $(warning check not supported for cross-build)
 endif
 
 samples: icu

-       (cd $(OBJROOT)/samples; \
+       (cd $(OBJROOT_CURRENT)/samples; \

                $(MAKE) $(ENV_DEBUG) $(LIBOVERRIDES); \
        );
 
 extra: icu
                $(MAKE) $(ENV_DEBUG) $(LIBOVERRIDES); \
        );
 
 extra: icu

-       (cd $(OBJROOT)/extra; \
+       (cd $(OBJROOT_CURRENT)/extra; \

                $(MAKE) $(ENV_DEBUG) $(LIBOVERRIDES); \
        );
 
 ifneq "$(CROSS_BUILD)" "YES"
                $(MAKE) $(ENV_DEBUG) $(LIBOVERRIDES); \
        );
 
 ifneq "$(CROSS_BUILD)" "YES"

-$(OBJROOT)/Makefile : 
+$(OBJROOT_CURRENT)/Makefile : 

 else
 else

-$(OBJROOT)/Makefile : crossbuildhost
+$(OBJROOT_CURRENT)/Makefile : crossbuildhost

 endif
 endif

-       if test ! -d $(OBJROOT); then \
-               mkdir -p $(OBJROOT); \
+       if test ! -d $(OBJROOT_CURRENT); then \
+               mkdir -p $(OBJROOT_CURRENT); \

        fi;
        fi;

+       cp -Rpf $(SRCROOT)/icuSources/* $(OBJROOT_CURRENT)/;

        if test "$(WINDOWS)" = "YES"; then \
        if test "$(WINDOWS)" = "YES"; then \

-               cp -Rpf $(SRCROOT)/icuSources/* $(OBJROOT); \
-               (cd $(OBJROOT)/data/unidata; mv base_unidata/*.txt .;); \
-               (cd $(OBJROOT)/data/unidata/norm2; mv base_norm2/*.txt .;); \
-               (cd $(OBJROOT)/data/in; mv base_in/*.nrm .; mv base_in/*.icu .;); \
-               (cd $(OBJROOT); $(ENV_CONFIGURE) ./runConfigureICU Cygwin/MSVC $(CONFIG_FLAGS);) \
+               echo "# configure for target"; \
+               (cd $(OBJROOT_CURRENT)/data/unidata; mv base_unidata/*.txt .;); \
+               (cd $(OBJROOT_CURRENT)/data/unidata/norm2; mv base_norm2/*.txt .;); \
+               (cd $(OBJROOT_CURRENT)/data/in; mv base_in/*.nrm .; mv base_in/*.icu .;); \
+               (cd $(OBJROOT_CURRENT); $(ENV_CONFIGURE) ./runConfigureICU Cygwin/MSVC $(CONFIG_FLAGS);) \

        elif test "$(LINUX)" = "YES"; then \
        elif test "$(LINUX)" = "YES"; then \

-               cp -Rpf $(SRCROOT)/icuSources/* $(OBJROOT); \
-               (cd $(OBJROOT)/data/unidata; mv base_unidata/*.txt .;); \
-               (cd $(OBJROOT)/data/unidata/norm2; mv base_norm2/*.txt .;); \
-               (cd $(OBJROOT)/data/in; mv base_in/*.nrm .; mv base_in/*.icu .;); \
-               (cd $(OBJROOT); $(ENV_CONFIGURE) ./runConfigureICU Linux $(CONFIG_FLAGS);) \
+               echo "# configure for target"; \
+               (cd $(OBJROOT_CURRENT)/data/unidata; mv base_unidata/*.txt .;); \
+               (cd $(OBJROOT_CURRENT)/data/unidata/norm2; mv base_norm2/*.txt .;); \
+               (cd $(OBJROOT_CURRENT)/data/in; mv base_in/*.nrm .; mv base_in/*.icu .;); \
+               (cd $(OBJROOT_CURRENT); $(ENV_CONFIGURE) ./runConfigureICU Linux $(CONFIG_FLAGS);) \

        elif test "$(CROSS_BUILD)" = "YES"; then \
        elif test "$(CROSS_BUILD)" = "YES"; then \

-               (cd $(OBJROOT); $(ENV_CONFIGURE) $(SRCROOT)/icuSources/configure --host=$(TARGET_SPEC) --with-cross-build=$(CROSSHOST_OBJROOT) $(CONFIG_FLAGS);) \
+               echo "# configure for crossbuild target"; \
+               (cd $(OBJROOT_CURRENT); $(ENV_CONFIGURE) ./configure --host=$(TARGET_SPEC) --with-cross-build=$(CROSSHOST_OBJROOT) $(CONFIG_FLAGS);) \

        else \
        else \

-               (cd $(OBJROOT); $(ENV_CONFIGURE) $(SRCROOT)/icuSources/runConfigureICU MacOSX $(CONFIG_FLAGS);) \
+               echo "# configure for non-crossbuild target"; \
+               (cd $(OBJROOT_CURRENT); $(ENV_CONFIGURE) ./runConfigureICU MacOSX $(CONFIG_FLAGS);) \

        fi;
        if test "$(APPLE_EMBEDDED)" = "YES"; then \
        fi;
        if test "$(APPLE_EMBEDDED)" = "YES"; then \

-               (cd $(OBJROOT)/common/unicode/; \
-                       cp $(SRCROOT)/icuSources/common/unicode/uconfig.h . ; \
-                       cp $(SRCROOT)/icuSources/common/unicode/udata.h . ; \
-                       cp $(SRCROOT)/icuSources/common/unicode/utypes.h . ; \
-                       patch <$(SRCROOT)/minimalpatchconfig.txt;) \
+               (cd $(OBJROOT_CURRENT)/common/unicode/; patch <$(SRCROOT)/minimalpatchconfig.txt;) \

        elif test "$(WINDOWS)" = "YES"; then \
        elif test "$(WINDOWS)" = "YES"; then \

-               (cd $(OBJROOT)/common/unicode/; \
-                       cp $(SRCROOT)/icuSources/common/unicode/uconfig.h . ; \
-                       cp $(SRCROOT)/icuSources/common/unicode/utypes.h . ; \
-                       patch <$(SRCROOT)/windowspatchconfig.txt;) \
+               (cd $(OBJROOT_CURRENT)/common/unicode/; patch <$(SRCROOT)/windowspatchconfig.txt;) \

        else \
        else \

-               (cd $(OBJROOT)/common/unicode/; \
-                       cp $(SRCROOT)/icuSources/common/unicode/uconfig.h . ; \
-                       cp $(SRCROOT)/icuSources/common/unicode/utypes.h . ; \
-                       patch <$(SRCROOT)/patchconfig.txt;) \
+               (cd $(OBJROOT_CURRENT)/common/unicode/; patch <$(SRCROOT)/patchconfig.txt;) \

        fi; \
        fi; \

-       if test -f $(SRCROOT)/icuSources/common/Makefile.local; then \
-               cp -p $(SRCROOT)/icuSources/common/Makefile.local $(OBJROOT)/common/ ; \
-       fi; 
-       if test -f $(SRCROOT)/icuSources/i18n/Makefile.local; then \
-               cp -p $(SRCROOT)/icuSources/i18n/Makefile.local $(OBJROOT)/i18n/ ; \
-       fi; 

 
 # for the tools that build the data file, cannot set UDATA_DEFAULT_ACCESS = UDATA_ONLY_PACKAGES
 # as minimalpatchconfig.txt does; need different patches for the host build.
 
 # for the tools that build the data file, cannot set UDATA_DEFAULT_ACCESS = UDATA_ONLY_PACKAGES
 # as minimalpatchconfig.txt does; need different patches for the host build.


@@ -772,17 +1046,10 @@ $(CROSSHOST_OBJROOT)/Makefile :
        if test ! -d $(CROSSHOST_OBJROOT); then \
                mkdir -p $(CROSSHOST_OBJROOT); \
        fi;
        if test ! -d $(CROSSHOST_OBJROOT); then \
                mkdir -p $(CROSSHOST_OBJROOT); \
        fi;

-       (cd $(CROSSHOST_OBJROOT); $(ENV_CONFIGURE_BUILDHOST) $(SRCROOT)/icuSources/runConfigureICU MacOSX $(CONFIG_FLAGS);)
-       (cd $(CROSSHOST_OBJROOT)/common/unicode/; \
-               cp $(SRCROOT)/icuSources/common/unicode/uconfig.h . ; \
-               cp $(SRCROOT)/icuSources/common/unicode/utypes.h . ; \
-               patch <$(SRCROOT)/crosshostpatchconfig.txt;)
-       if test -f $(SRCROOT)/icuSources/common/Makefile.local; then \
-               cp -p $(SRCROOT)/icuSources/common/Makefile.local $(CROSSHOST_OBJROOT)/common/ ; \
-       fi; 
-       if test -f $(SRCROOT)/icuSources/i18n/Makefile.local; then \
-               cp -p $(SRCROOT)/icuSources/i18n/Makefile.local $(CROSSHOST_OBJROOT)/i18n/ ; \
-       fi; 
+       cp -Rpf $(SRCROOT)/icuSources/* $(CROSSHOST_OBJROOT);
+       echo "# configure for crossbuild host";
+       (cd $(CROSSHOST_OBJROOT); $(ENV_CONFIGURE_BUILDHOST) ./runConfigureICU MacOSX $(CONFIG_FLAGS);)
+       (cd $(CROSSHOST_OBJROOT)/common/unicode/; patch <$(SRCROOT)/crosshostpatchconfig.txt;)

 
 #################################
 # B&I TARGETS
 
 #################################
 # B&I TARGETS


@@ -796,7 +1063,7 @@ $(CROSSHOST_OBJROOT)/Makefile :
 installsrc :
        if test ! -d $(SRCROOT); then mkdir $(SRCROOT); fi;
        if test -d $(SRCROOT)/icuSources ; then rm -rf $(SRCROOT)/icuSources; fi;
 installsrc :
        if test ! -d $(SRCROOT); then mkdir $(SRCROOT); fi;
        if test -d $(SRCROOT)/icuSources ; then rm -rf $(SRCROOT)/icuSources; fi;

-       tar cf - ./makefile ./ICU.plist ./license.html ./icuSources $(INSTALLSRC_VARFILES) | (cd $(SRCROOT) ; tar xfp -); \
+       tar cf - ./makefile ./ICU.plist ./license.html ./icuSources ./cldrFiles $(INSTALLSRC_VARFILES) | (cd $(SRCROOT) ; tar xfp -); \

        for i in `find $(SRCROOT)/icuSources/ | grep "CVS$$"` ; do \
                if test -d $$i ; then \
                        rm -rf $$i; \
        for i in `find $(SRCROOT)/icuSources/ | grep "CVS$$"` ; do \
                if test -d $$i ; then \
                        rm -rf $$i; \


@@ -819,8 +1086,8 @@ else
 installhdrs : installhdrsint
 endif
        
 installhdrs : installhdrsint
 endif
        

-installhdrsint : $(OBJROOT)/Makefile
-       (cd $(OBJROOT); \
+installhdrsint : $(OBJROOT_CURRENT)/Makefile
+       (cd $(OBJROOT_CURRENT); \

                for subdir in $(HDR_MAKE_SUBDIR); do \
                        (cd $$subdir; $(MAKE) -e DESTDIR=$(DEST_ROOT) $(ENV) install-headers); \
                done; \
                for subdir in $(HDR_MAKE_SUBDIR); do \
                        (cd $$subdir; $(MAKE) -e DESTDIR=$(DEST_ROOT) $(ENV) install-headers); \
                done; \


@@ -828,7 +1095,7 @@ installhdrsint : $(OBJROOT)/Makefile
                        if test ! -d $(DEST_ROOT)$(HDR_PREFIX)/include/unicode/; then \
                                $(INSTALL) -d -m 0755 $(DEST_ROOT)$(HDR_PREFIX)/include/unicode/; \
                        fi; \
                        if test ! -d $(DEST_ROOT)$(HDR_PREFIX)/include/unicode/; then \
                                $(INSTALL) -d -m 0755 $(DEST_ROOT)$(HDR_PREFIX)/include/unicode/; \
                        fi; \

-                       if test -d $(DEST_ROOT)/$(PRIVATE_HDR_PREFIX)/include/unicode/; then \
+                       if test -d $(DEST_ROOT)$(PRIVATE_HDR_PREFIX)/include/unicode/; then \

                                (cd $(DEST_ROOT)$(PRIVATE_HDR_PREFIX)/include/unicode; \
                                        for i in *.h; do \
                                                if fgrep -q -x $$i $(SRCROOT)/minimalapis.txt ; then \
                                (cd $(DEST_ROOT)$(PRIVATE_HDR_PREFIX)/include/unicode; \
                                        for i in *.h; do \
                                                if fgrep -q -x $$i $(SRCROOT)/minimalapis.txt ; then \


@@ -836,8 +1103,12 @@ installhdrsint : $(OBJROOT)/Makefile
                                                fi ; \
                                        done ); \
                                $(CC) $(SRCROOT)/minimalapisTest.c $(INSTALLHDRS_ARCH) $(ISYSROOT) -nostdinc \
                                                fi ; \
                                        done ); \
                                $(CC) $(SRCROOT)/minimalapisTest.c $(INSTALLHDRS_ARCH) $(ISYSROOT) -nostdinc \

-                                       -I $(DEST_ROOT)$(HDR_PREFIX)/include/ -I $(SDKROOT)/usr/include/ -E > /dev/null ; \
+                                       -I $(DEST_ROOT)$(HDR_PREFIX)/include/ -I $(SDKPATH)/usr/include/ -E > /dev/null ; \

                        fi; \
                        fi; \

+                       if test ! -d $(DEST_ROOT)$(CLDRFILESDIR)/; then \
+                               $(INSTALL) -d -m 0755 $(DEST_ROOT)$(CLDRFILESDIR)/; \
+                       fi; \
+                       $(INSTALL) -b -m 0644  $(SRCROOT)/cldrFiles/supplementalData.xml $(DEST_ROOT)$(CLDRFILESDIR)/supplementalData.xml; \

                fi; \
        );
 
                fi; \
        );
 


@@ -847,45 +1118,53 @@ installhdrsint : $(OBJROOT)/Makefile
 # We cleanup the sources folder.
 
 install : installhdrsint icu
 # We cleanup the sources folder.
 
 install : installhdrsint icu

-       if test ! -d $(DEST_ROOT)$(libdir)/; then \
-               $(INSTALL) -d -m 0755 $(DEST_ROOT)$(libdir)/; \
-       fi;

        if test "$(WINDOWS)" = "YES"; then \
        if test "$(WINDOWS)" = "YES"; then \

-               if test ! -d $(DEST_ROOT)$(winlibdir)/; then \
-                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(winlibdir)/; \
+               if test ! -d $(DEST_ROOT)$(winprogdir)/; then \
+                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(winprogdir)/; \
+               fi; \
+               if test ! -d $(DEST_ROOT)$(winintlibdir)/; then \
+                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(winintlibdir)/; \
+               fi; \
+               $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/libicuuc.lib $(DEST_ROOT)$(winintlibdir)libicuuc.lib; \
+               $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/libicuuc.pdb $(DEST_ROOT)$(winprogdir)libicuuc.pdb; \
+               $(INSTALL) -b -m 0755 $(OBJROOT_CURRENT)/lib/libicuuc.dll $(DEST_ROOT)$(winprogdir)libicuuc.dll; \
+               $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/libicuin.lib $(DEST_ROOT)$(winintlibdir)libicuin.lib; \
+               $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/libicuin.pdb $(DEST_ROOT)$(winprogdir)libicuin.pdb; \
+               $(INSTALL) -b -m 0755 $(OBJROOT_CURRENT)/lib/libicuin.dll $(DEST_ROOT)$(winprogdir)libicuin.dll; \
+               $(INSTALL) -b -m 0755 $(OBJROOT_CURRENT)/lib/icudt$(ICU_VERS).dll $(DEST_ROOT)$(winprogdir)icudt$(ICU_VERS).dll; \
+               if test "$(ARCH64)" != "YES"; then \
+                       $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/shim/icuuc.lib $(DEST_ROOT)$(winintlibdir)icuuc.lib; \
+                       $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/icuuc40.pdb $(DEST_ROOT)$(winprogdir)icuuc40.pdb; \
+                       $(INSTALL) -b -m 0755 $(OBJROOT_CURRENT)/lib/icuuc40.dll $(DEST_ROOT)$(winprogdir)icuuc40.dll; \
+                       $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/shim/icuin.lib $(DEST_ROOT)$(winintlibdir)icuin.lib; \
+                       $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/icuin40.pdb $(DEST_ROOT)$(winprogdir)icuin40.pdb; \
+                       $(INSTALL) -b -m 0755 $(OBJROOT_CURRENT)/lib/icuin40.dll $(DEST_ROOT)$(winprogdir)icuin40.dll; \

                fi; \
                fi; \

-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/libicuuc.lib $(DEST_ROOT)$(winlibdir)libicuuc.lib; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/libicuuc.pdb $(DEST_ROOT)$(libdir)libicuuc.pdb; \
-               $(INSTALL) -b -m 0755 $(OBJROOT)/lib/libicuuc.dll $(DEST_ROOT)$(libdir)libicuuc.dll; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/libicuin.lib $(DEST_ROOT)$(winlibdir)libicuin.lib; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/libicuin.pdb $(DEST_ROOT)$(libdir)libicuin.pdb; \
-               $(INSTALL) -b -m 0755 $(OBJROOT)/lib/libicuin.dll $(DEST_ROOT)$(libdir)libicuin.dll; \
-               $(INSTALL) -b -m 0755 $(OBJROOT)/lib/icudt$(ICU_VERS).dll $(DEST_ROOT)$(libdir)icudt$(ICU_VERS).dll; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/shim/icuuc.lib $(DEST_ROOT)$(winlibdir)icuuc.lib; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/icuuc40.pdb $(DEST_ROOT)$(libdir)icuuc40.pdb; \
-               $(INSTALL) -b -m 0755 $(OBJROOT)/lib/icuuc40.dll $(DEST_ROOT)$(libdir)icuuc40.dll; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/shim/icuin.lib $(DEST_ROOT)$(winlibdir)icuin.lib; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/icuin40.pdb $(DEST_ROOT)$(libdir)icuin40.pdb; \
-               $(INSTALL) -b -m 0755 $(OBJROOT)/lib/icuin40.dll $(DEST_ROOT)$(libdir)icuin40.dll; \

        else \
        else \

-               $(INSTALL) -b -m 0755 $(OBJROOT)/$(INSTALLED_DYLIB) $(DEST_ROOT)$(libdir)$(INSTALLED_DYLIB); \
+               if test ! -d $(DEST_ROOT)$(libdir)/; then \
+                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(libdir)/; \
+               fi; \
+               $(INSTALL) -b -m 0755 $(OBJROOT_CURRENT)/$(INSTALLED_DYLIB) $(DEST_ROOT)$(libdir)$(INSTALLED_DYLIB); \

                if test "$(LINUX)" = "YES"; then \
                if test "$(LINUX)" = "YES"; then \

-                       cp $(OBJROOT)/$(INSTALLED_DYLIB) $(SYMROOT)/$(INSTALLED_DYLIB); \
+                       cp $(OBJROOT_CURRENT)/$(INSTALLED_DYLIB) $(SYMROOT_CURRENT)/$(INSTALLED_DYLIB); \

                        strip -x -S $(DEST_ROOT)$(libdir)$(INSTALLED_DYLIB); \
                else \
                        (cd $(DEST_ROOT)$(libdir); \
                        ln -fs  $(INSTALLED_DYLIB) $(DYLIB)); \
                        strip -x -S $(DEST_ROOT)$(libdir)$(INSTALLED_DYLIB); \
                else \
                        (cd $(DEST_ROOT)$(libdir); \
                        ln -fs  $(INSTALLED_DYLIB) $(DYLIB)); \

-                       cp $(OBJROOT)/$(INSTALLED_DYLIB) $(SYMROOT)/$(INSTALLED_DYLIB); \
-                       strip -x -u -r -S $(DEST_ROOT)$(libdir)$(INSTALLED_DYLIB); \
-               fi;     \
+                       cp $(OBJROOT_CURRENT)/$(INSTALLED_DYLIB) $(SYMROOT_CURRENT)/$(INSTALLED_DYLIB); \
+                       if test "$(APPLE_EMBEDDED)" = "NO"; then \
+                               $(DSYMTOOL) -o $(SYMROOT_CURRENT)/$(INSTALLED_DYLIB)$(DSYMSUFFIX) $(SYMROOT_CURRENT)/$(INSTALLED_DYLIB); \
+                       fi; \
+                       $(STRIPCMD) -x -u -r -S $(DEST_ROOT)$(libdir)$(INSTALLED_DYLIB); \
+               fi; \

                for subdir in $(EXTRA_LIBS); do \
                for subdir in $(EXTRA_LIBS); do \

-                       (cd $(OBJROOT)/$$subdir; $(MAKE) -e DESTDIR=$(DEST_ROOT) $(ENV) install-library;) \
+                       (cd $(OBJROOT_CURRENT)/$$subdir; $(MAKE) -e DESTDIR=$(DEST_ROOT) $(ENV) install-library;) \

                done; \
                done; \

-               if test ! -d $(DEST_ROOT)$(datadir)/; then \
-                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(datadir)/; \
-               fi;     \
-               if test -f $(OBJROOT)/$(L_DATA_FILE); then \
-                       $(INSTALL) -b -m 0644  $(OBJROOT)/$(L_DATA_FILE) $(DEST_ROOT)$(datadir)$(L_DATA_FILE); \
+               if test ! -d $(DEST_ROOT)$(DATA_INSTALL_DIR)/; then \
+                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(DATA_INSTALL_DIR)/; \
+               fi; \
+               if test -f $(OBJROOT_CURRENT)/$(L_DATA_FILE); then \
+                       $(INSTALL) -b -m 0644  $(OBJROOT_CURRENT)/$(L_DATA_FILE) $(DEST_ROOT)$(DATA_INSTALL_DIR)$(L_DATA_FILE); \

                fi; \
                if test ! -d $(DEST_ROOT)$(OPEN_SOURCE_VERSIONS_DIR)/; then \
                        $(INSTALL) -d -m 0755 $(DEST_ROOT)$(OPEN_SOURCE_VERSIONS_DIR)/; \
                fi; \
                if test ! -d $(DEST_ROOT)$(OPEN_SOURCE_VERSIONS_DIR)/; then \
                        $(INSTALL) -d -m 0755 $(DEST_ROOT)$(OPEN_SOURCE_VERSIONS_DIR)/; \


@@ -895,11 +1174,17 @@ install : installhdrsint icu
                        $(INSTALL) -d -m 0755 $(DEST_ROOT)$(OPEN_SOURCE_LICENSES_DIR)/; \
                fi; \
                $(INSTALL) -b -m 0644 $(SRCROOT)/license.html $(DEST_ROOT)$(OPEN_SOURCE_LICENSES_DIR)ICU.html; \
                        $(INSTALL) -d -m 0755 $(DEST_ROOT)$(OPEN_SOURCE_LICENSES_DIR)/; \
                fi; \
                $(INSTALL) -b -m 0644 $(SRCROOT)/license.html $(DEST_ROOT)$(OPEN_SOURCE_LICENSES_DIR)ICU.html; \

-               if test ! -d $(DEST_ROOT)$(localtooldir)/; then \
-                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(localtooldir)/; \
-               fi;     \
-               if test -f $(OBJROOT)/$(INFOTOOL); then \
-                       $(INSTALL) -b -m 0755  $(OBJROOT)/$(INFOTOOL) $(DEST_ROOT)$(localtooldir)$(INFOTOOL); \
+               if test -f $(OBJROOT_CURRENT)/$(INFOTOOL); then \
+                       if test ! -d $(DEST_ROOT)$(localtooldir)/; then \
+                               $(INSTALL) -d -m 0755 $(DEST_ROOT)$(localtooldir)/; \
+                       fi; \
+                       $(INSTALL) -b -m 0755  $(OBJROOT_CURRENT)/$(INFOTOOL) $(DEST_ROOT)$(localtooldir)$(INFOTOOL); \
+                       if test "$(LINUX)" != "YES"; then \
+                               cp $(OBJROOT_CURRENT)/$(INFOTOOL) $(SYMROOT_CURRENT)/$(INFOTOOL); \
+                               if test "$(APPLE_EMBEDDED)" = "NO"; then \
+                                       $(DSYMTOOL) -o $(SYMROOT_CURRENT)/$(INFOTOOL)$(DSYMSUFFIX) $(SYMROOT_CURRENT)/$(INFOTOOL); \
+                               fi; \
+                       fi; \

                fi; \
        fi;
 
                fi; \
        fi;
 


@@ -908,32 +1193,35 @@ DEPEND_install_profile = profile
        
 .SECONDEXPANSION:
 install_debug install_profile : $$(DEPEND_$$@)
        
 .SECONDEXPANSION:
 install_debug install_profile : $$(DEPEND_$$@)

-       if test ! -d $(DEST_ROOT)$(libdir)/; then \
-               $(INSTALL) -d -m 0755 $(DEST_ROOT)$(libdir)/; \
-       fi;

        if test "$(WINDOWS)" = "YES"; then \
        if test "$(WINDOWS)" = "YES"; then \

-               if test ! -d $(DEST_ROOT)$(winlibdir)/; then \
-                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(winlibdir)/; \
+               if test ! -d $(DEST_ROOT)$(winprogdir)/; then \
+                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(winprogdir)/; \
+               fi; \
+               if test ! -d $(DEST_ROOT)$(winintlibdir)/; then \
+                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(winintlibdir)/; \

                fi; \
                fi; \

-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/libicuuc_$(DEPEND_$@).lib $(DEST_ROOT)$(winlibdir)libicuuc_$(DEPEND_$@).lib; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/libicuuc_$(DEPEND_$@).pdb $(DEST_ROOT)$(libdir)libicuuc_$(DEPEND_$@).pdb; \
-               $(INSTALL) -b -m 0755 $(OBJROOT)/lib/libicuuc_$(DEPEND_$@).dll $(DEST_ROOT)$(libdir)libicuuc_$(DEPEND_$@).dll; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/libicuin_$(DEPEND_$@).lib $(DEST_ROOT)$(winlibdir)libicuin_$(DEPEND_$@).lib; \
-               $(INSTALL) -b -m 0644 $(OBJROOT)/lib/libicuin_$(DEPEND_$@).pdb $(DEST_ROOT)$(libdir)libicuin_$(DEPEND_$@).pdb; \
-               $(INSTALL) -b -m 0755 $(OBJROOT)/lib/libicuin_$(DEPEND_$@).dll $(DEST_ROOT)$(libdir)libicuin_$(DEPEND_$@).dll; \
+               $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/libicuuc_$(DEPEND_$@).lib $(DEST_ROOT)$(winintlibdir)libicuuc_$(DEPEND_$@).lib; \
+               $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/libicuuc_$(DEPEND_$@).pdb $(DEST_ROOT)$(winprogdir)libicuuc_$(DEPEND_$@).pdb; \
+               $(INSTALL) -b -m 0755 $(OBJROOT_CURRENT)/lib/libicuuc_$(DEPEND_$@).dll $(DEST_ROOT)$(winprogdir)libicuuc_$(DEPEND_$@).dll; \
+               $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/libicuin_$(DEPEND_$@).lib $(DEST_ROOT)$(winintlibdir)libicuin_$(DEPEND_$@).lib; \
+               $(INSTALL) -b -m 0644 $(OBJROOT_CURRENT)/lib/libicuin_$(DEPEND_$@).pdb $(DEST_ROOT)$(winprogdir)libicuin_$(DEPEND_$@).pdb; \
+               $(INSTALL) -b -m 0755 $(OBJROOT_CURRENT)/lib/libicuin_$(DEPEND_$@).dll $(DEST_ROOT)$(winprogdir)libicuin_$(DEPEND_$@).dll; \

        else \
        else \

-               $(INSTALL) -b -m 0664 $(OBJROOT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))) $(DEST_ROOT)$(libdir)$($(INSTALLED_DYLIB_$(DEPEND_$@))); \
+               if test ! -d $(DEST_ROOT)$(libdir)/; then \
+                       $(INSTALL) -d -m 0755 $(DEST_ROOT)$(libdir)/; \
+               fi; \
+               $(INSTALL) -b -m 0664 $(OBJROOT_CURRENT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))) $(DEST_ROOT)$(libdir)$($(INSTALLED_DYLIB_$(DEPEND_$@))); \

                if test "$(LINUX)" = "YES"; then \
                if test "$(LINUX)" = "YES"; then \

-                       cp $(OBJROOT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))) $(SYMROOT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))); \
+                       cp $(OBJROOT_CURRENT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))) $(SYMROOT_CURRENT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))); \

                        strip -x -S $(DEST_ROOT)$(libdir)$($(INSTALLED_DYLIB_$(DEPEND_$@))); \
                else \
                        (cd $(DEST_ROOT)$(libdir); \
                        ln -fs  $($(INSTALLED_DYLIB_$(DEPEND_$@))) $($(DYLIB_$(DEPEND_$@)))); \
                        strip -x -S $(DEST_ROOT)$(libdir)$($(INSTALLED_DYLIB_$(DEPEND_$@))); \
                else \
                        (cd $(DEST_ROOT)$(libdir); \
                        ln -fs  $($(INSTALLED_DYLIB_$(DEPEND_$@))) $($(DYLIB_$(DEPEND_$@)))); \

-                       cp $(OBJROOT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))) $(SYMROOT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))); \
-                       strip -x -u -r -S $(DEST_ROOT)$(libdir)$($(INSTALLED_DYLIB_$(DEPEND_$@))); \
-               fi;     \
+                       cp $(OBJROOT_CURRENT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))) $(SYMROOT_CURRENT)/$($(INSTALLED_DYLIB_$(DEPEND_$@))); \
+                       $(STRIPCMD) -x -u -r -S $(DEST_ROOT)$(libdir)$($(INSTALLED_DYLIB_$(DEPEND_$@))); \
+               fi; \

                for subdir in $(EXTRA_LIBS); do \
                for subdir in $(EXTRA_LIBS); do \

-                       (cd $(OBJROOT)/$$subdir; $(MAKE) -e DESTDIR=$(DEST_ROOT) $(ENV) install-library;) \
+                       (cd $(OBJROOT_CURRENT)/$$subdir; $(MAKE) -e DESTDIR=$(DEST_ROOT) $(ENV) install-library;) \

                done; \
        fi;
 
                done; \
        fi;