INTEGRATION: CWS geordi2q14 (1.25.6); FILE MERGED

2004/01/30 11:51:14 hr 1.25.6.1: #111934#: merge CWS ooo111fix2

stlport/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.25 $
+#   $Revision: 1.26 $
 #
-#   last change: $Author: vg $ $Date: 2003-12-17 17:42:57 $
+#   last change: $Author: hr $ $Date: 2004-02-02 20:28:14 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -73,10 +73,13 @@ TARGET=so_stlport
 .EXPORT : CC CXX
 .IF "$(COMID)"=="gcc3"
     TARFILE_NAME=STLport-4.5
-    PATCH_FILE_NAME=STLport-4.5.patch
+       .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103"
+               PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch
+       .ELSE
+               PATCH_FILE_NAME=STLport-4.5.patch
+       .ENDIF
 .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.
         TARFILE_NAME=STLport-4.0
         PATCH_FILE_NAME=STLport-4.0.macosx.patch
     .ELSE