From 858ae2c1a09da6c4f865fc3b857187f55beb5be0 Mon Sep 17 00:00:00 2001 From: Michael Ow Date: Mon, 4 Oct 2010 23:52:24 +0000 Subject: [PATCH] ICU-7883 Ensure that the path has the proper backslash. X-SVN-Rev: 28761 --- icu4c/source/icudefs.mk.in | 4 ++-- icu4c/source/test/testdata/Makefile.in | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/icu4c/source/icudefs.mk.in b/icu4c/source/icudefs.mk.in index e0dcb244b1d..c2c5747e867 100644 --- a/icu4c/source/icudefs.mk.in +++ b/icu4c/source/icudefs.mk.in @@ -221,9 +221,9 @@ TOOLBINDIR=$(BINDIR) TOOLLIBDIR=$(LIBDIR) # Current full path directory. -CURR_FULL_DIR=$(shell pwd) +CURR_FULL_DIR=$(shell pwd | sed 's/ /\\ /') # Current full path directory for use in source code in a -D compiler option. -CURR_SRCCODE_FULL_DIR=$(shell pwd) +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. diff --git a/icu4c/source/test/testdata/Makefile.in b/icu4c/source/test/testdata/Makefile.in index 963d6f94704..40c79f96c29 100644 --- a/icu4c/source/test/testdata/Makefile.in +++ b/icu4c/source/test/testdata/Makefile.in @@ -103,6 +103,12 @@ ICU_DATA_OPT = -i $(BUILDDIR) endif endif +CURDIR:=$(CURR_FULL_DIR) +# current directory should not be blank +ifeq ($(CURDIR),) +CURDIR=. +endif + PKGDATA = $(TOOLBINDIR)/pkgdata -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) PKGDATA_INVOKE:=$(INVOKE) $(PKGDATA_INVOKE_OPTS) @@ -268,4 +274,4 @@ icu4j-data-install: $(ICU4J_DATA) endif -icu4j-data: $(ICU4J_DATA) \ No newline at end of file +icu4j-data: $(ICU4J_DATA)