diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:37:16 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:37:16 +0000 |
| commit | da697cd26b017cef5e0fb650b2c2d0805fab8996 (patch) | |
| tree | f4175fe29c4a5e3379a6f4ae747d166ee6009175 /icu | |
| parent | 3361e294a8bdc316999ab7af3160c539c7e3a4c9 (diff) | |
INTEGRATION: CWS ause069 (1.30.2); FILE MERGED
2007/01/10 21:53:53 hjs 1.30.2.3: RESYNC: (1.30-1.31); FILE MERGED
2006/12/12 12:40:32 hjs 1.30.2.2: #i70359# remove forced shell calls
2006/10/18 17:11:21 hjs 1.30.2.1: #i70359# remove forced shell calls
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index cd12d6161846..664c2973ced4 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.32 $ +# $Revision: 1.33 $ # -# last change: $Author: obo $ $Date: 2007-01-23 06:31:31 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:37:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -58,10 +58,10 @@ PATCH_FILE_NAME=${TARFILE_NAME}.patch .IF "$(GUI)"=="UNX" .IF "$(COMNAME)"=="sunpro5" -.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" -CC:=$(COMPATH)$/bin$/cc -CXX:=$(COMPATH)$/bin$/CC -.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" +#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" +#CC:=$(COMPATH)$/bin$/cc +#CXX:=$(COMPATH)$/bin$/CC +#.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" .ENDIF # "$(COMNAME)"=="sunpro5" .IF "$(SYSBASE)"!="" @@ -154,7 +154,7 @@ ICU_BUILD_VERSION=Release ICU_BUILD_LIBPOST= .ENDIF -CONFIGURE_ACTION+= $(COPY) ..$/..$/..$/..$/..$/makefiles.zip . $(BUILD_ACTION_SEP) unzip makefiles.zip +CONFIGURE_ACTION+= $(COPY:s/+//) ..$/..$/..$/..$/..$/makefiles.zip . $(BUILD_ACTION_SEP) unzip makefiles.zip .IF "$(CCNUMVER)"<="001400000000" BUILD_ACTION=cd allinone && nmake /f all.mak CFG="all - Win32 Release" EXFLAGS="-EHsc" && cd ..$/.. @@ -191,7 +191,7 @@ OUT2BIN= \ $(PACKAGE_DIR)$/so_add_binary : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILE_NAME) | tar $(TAR_EXCLUDE_SWITCH) -xvf - - +$(TOUCH) $(PACKAGE_DIR)$/so_add_binary + $(TOUCH) $(PACKAGE_DIR)$/so_add_binary $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary |