diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-04 09:41:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-04 09:41:41 +0000 |
| commit | fcbb45fe5066ae810b651d23ceccee7ffea08ed0 (patch) | |
| tree | c4ee10c5dc88b524a6dbdd9836cabd94d9ff2cb1 /icu | |
| parent | aa32e5ac86bf05ad56ca5abff65f8fa90c6b4935 (diff) | |
INTEGRATION: CWS ause05 (1.10.10); FILE MERGED
2003/05/28 10:45:47 hjs 1.10.10.1: #i14194# buildproblems with icu configure
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index ab78875da6a0..691e3bdc0bb7 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: vg $ $Date: 2003-04-01 13:37:27 $ +# last change: $Author: vg $ $Date: 2003-06-04 10:41:41 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -85,10 +85,11 @@ ADDITIONAL_FILES=source$/data$/brkitr$/edit_word.txt \ .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)" .ENDIF # "$(COMNAME)"=="sunpro5" -.EXPORT : CC CXX CONFIGURE_DIR=source @@ -162,9 +163,6 @@ all: \ .INCLUDE : target.mk .INCLUDE : tg_ext.mk -TG_DELIVER : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) - $(DELIVER) - .IF "$(BINARY_PATCH_FILE_NAME)"!="" $(PACKAGE_DIR)$/so_add_binary : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) @@ -184,7 +182,3 @@ $(MISC)$/remove_build.flag : $(BINARY_PATCH_FILE_NAME) $(PATCH_FILE_NAME) makefi $(REMOVE_PACKAGE_COMMAND) +$(TOUCH) $(MISC)$/remove_build.flag -.IF "$(BUILD_SOSL)"!="" -ALLTAR : TG_DELIVER -.ENDIF - |