diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 16:42:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 16:42:57 +0000 |
| commit | e94e4ed75f37b929e213a9061ad84482eb58b5fa (patch) | |
| tree | c20e6a4b89d20ad440536db1eb0f74a1a247fa53 /stlport | |
| parent | 84cfe152da7ab644cd4269dc47794f08ebf4ea8f (diff) | |
INTEGRATION: CWS geordi2q11 (1.24.4); FILE MERGED
2003/12/16 16:17:52 hr 1.24.4.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 1fee23874326..4944c7143e17 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: hr $ $Date: 2003-12-01 13:00:46 $ +# last change: $Author: vg $ $Date: 2003-12-17 17:42:57 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -73,7 +73,7 @@ TARGET=so_stlport .EXPORT : CC CXX .IF "$(COMID)"=="gcc3" TARFILE_NAME=STLport-4.5 - PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch + PATCH_FILE_NAME=STLport-4.5.patch .ELSE # "$(COMID)"=="gcc3" .IF "$(OS)"=="MACOSX" # [ed] For gcc2, we need to use STLport 4.0. 4.5 will not compile with gcc2 on OS X. @@ -155,7 +155,7 @@ OUT2INC= \ .IF "$(OS)"=="IRIX" TARFILE_NAME=STLport-4.5 -PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch +PATCH_FILE_NAME=STLport-4.5.patch BUILD_ACTION=gmake BUILD_FLAGS=-f gcc-3.0.mak BUILD_FLAGS+= -j$(MAXPROCESS) @@ -193,11 +193,6 @@ all : .INCLUDE : target.mk .INCLUDE : tg_ext.mk -$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.patch - -$(MISC)$/STLport-4.5.patch : STLport-4.5.patch - +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch - .IF "$(GUI)"=="WNT" .IF "$(CCNUMVER)"<="001300000000" |