ICU-9230 Merger r31679 into maint-49

X-SVN-Rev: 31680
This commit is contained in:
Michael Ow 2012-04-05 17:18:25 +00:00
parent 6226ec87b9
commit b048346842

View file

@ -221,11 +221,6 @@ BINDIR=$(top_builddir)/bin
TOOLBINDIR=$(BINDIR)
TOOLLIBDIR=$(LIBDIR)
# Current full path directory.
CURR_FULL_DIR=$(shell pwd | sed 's/ /\\ /g')
# Current full path directory for use in source code in a -D compiler option.
CURR_SRCCODE_FULL_DIR=$(shell pwd | sed 's/ /\\ /')
# Name flexibility for the library naming scheme. Any modifications should
# be made in the mh- file for the specific platform.
DATA_STUBNAME = data
@ -270,6 +265,11 @@ INSTALLED_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR)
# Platform-specific setup
include @platform_make_fragment@
# Current full path directory.
CURR_FULL_DIR=$(shell pwd | sed 's/ /\\ /g')
# Current full path directory for use in source code in a -D compiler option.
CURR_SRCCODE_FULL_DIR=$(shell pwd | sed 's/ /\\ /')
# When shared libraries are disabled and static libraries are enabled,
# the C++ compiler must be used to link in the libraries for the tools.
ifneq ($(ENABLE_SHARED),YES)