diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-12 14:31:01 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-12 14:31:01 +0000 |
| commit | 601dbde6988b0ec3fa37c4285d2dcf0d1c5776d3 (patch) | |
| tree | f3f1984240a04c1cf41459085c15fe42ac300f36 /stlport/makefile.mk | |
| parent | 684966385a3fa74757174d26482933aeefe872f4 (diff) | |
INTEGRATION: CWS macleopardbuild (1.40.8); FILE MERGED
2007/11/11 22:59:11 fheckl 1.40.8.2: fixing quotation error
2007/10/15 21:39:38 fheckl 1.40.8.1: Fixing Leopard build
Diffstat (limited to 'stlport/makefile.mk')
| -rw-r--r-- | stlport/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 6c58d14f8408..4a926b7376c8 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.40 $ +# $Revision: 1.41 $ # -# last change: $Author: hr $ $Date: 2007-07-31 13:10:28 $ +# last change: $Author: rt $ $Date: 2007-11-12 15:31:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -60,7 +60,7 @@ $(INCCOM)$/stlport$/hash_map : systemstl/hash_map .EXPORT : CC CXX .IF "$(COMID)"=="gcc3" TARFILE_NAME=STLport-4.5 - .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103" || "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX104" + .IF "$(OS)"=="MACOSX" && "$(BUILD_OS_MINOR)">"2" PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch .ELSE PATCH_FILE_NAME=STLport-4.5.patch |