diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
| commit | c326b2f169abf875912d8d40485eead41926981d (patch) | |
| tree | 47e6a13d3411d6b43c9d4ade11ac2a34314e4ebb /icu | |
| parent | 81341944540166215d0d166bbabc2f579308b546 (diff) | |
| parent | 084b3d7eae29d9e9e6e1a65054ffe4d11cda3576 (diff) | |
CWS-TOOLING: integrate CWS sb118
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index e5d0de314e82..70ff42c1a443 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -87,9 +87,8 @@ icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) icu_LDFLAGS+=$(EXTRA_LINKFLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) -BUILD_ACTION_SEP=; # remove conversion and transliteration data to reduce binary size. -CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk $(BUILD_ACTION_SEP) +CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ; # until someone introduces SOLARIS 64-bit builds .IF "$(OS)"=="SOLARIS" @@ -186,11 +185,6 @@ OUT2BIN= \ $(BUILD_DIR)$/bin$/gencmn.exe .ELSE -.IF "$(USE_SHELL)"=="4nt" -BUILD_ACTION_SEP=^ -.ELSE -BUILD_ACTION_SEP=; -.ENDIF # "$(USE_SHELL)"=="4nt" BUILD_DIR=source .IF "full_debug" == "" @@ -256,7 +250,7 @@ OUT2BIN= \ .IF "$(BINARY_PATCH_FILES)"!="" $(PACKAGE_DIR)$/so_add_binary : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) - cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar $(TAR_EXCLUDE_SWITCH) -xvf - + cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar -xvf - $(TOUCH) $(PACKAGE_DIR)$/so_add_binary $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary |