Index: makefile.mk
===================================================================
RCS file: /cvs/external/stlport/makefile.mk,v
retrieving revision 1.21
diff -u -r1.21 makefile.mk
--- makefile.mk	12 Jun 2003 09:50:58 -0000	1.21
+++ makefile.mk	3 Jul 2003 16:37:24 -0000
@@ -72,17 +72,17 @@
 # --- Files --------------------------------------------------------
 .EXPORT : CC CXX
 .IF "$(COMID)"=="gcc3"
-TARFILE_NAME=STLport-4.5
-PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
+	TARFILE_NAME=STLport-4.5
+	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.
-TARFILE_NAME=STLport-4.0
-PATCH_FILE_NAME=STLport-4.0.macosx.patch
-.ELSE
-TARFILE_NAME=STLport-4.0
-PATCH_FILE_NAME=STLport-4.0.patch
-.ENDIF			# "$(OS)"=="MACOSX"
+	.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
+		TARFILE_NAME=STLport-4.0
+		PATCH_FILE_NAME=STLport-4.0.patch
+	.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(COMID)"=="gcc3"
 
 .IF "$(GUI)"=="WNT"
@@ -99,7 +99,7 @@
 TAR_EXCLUDES=*/SC5/*
 .ENDIF          # "$(USE_SHELL)"=="4nt"
 
-ADDITIONAL_FILES=src$/gcc-3.0.mak
+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak
 
 
 CONFIGURE_ACTION=none
@@ -117,26 +117,28 @@
 .ENDIF
 
 .IF "$(COM)"=="GCC"
-.IF "$(COMID)"=="gcc3"
-# FreeBSD needs a special makefile
-.IF "$(OS)"=="FREEBSD"
-BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-.ELSE
-BUILD_FLAGS=-f gcc-3.0.mak
-.ENDIF
-.ELSE # "$(COMID)"=="gcc3"
-# MacOS X/Darwin need a special makefile
-.IF "$(OS)"=="MACOSX"
-    BUILD_FLAGS=-f gcc-apple-macosx.mak
-.ELIF "$(OS)"=="FREEBSD"
-    BUILD_FLAGS=-f gcc-freebsd.mak
-.ELSE # "$(OS)"=="MACOSX"
-    BUILD_FLAGS=-f gcc.mak
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF # "$(COMID)"=="gcc3"
-BUILD_ACTION=$(GNUMAKE)
-# build in parallel
-BUILD_FLAGS+= -j$(MAXPROCESS)
+	.IF "$(COMID)"=="gcc3"
+		# FreeBSD needs a special makefile
+		.IF "$(OS)"=="FREEBSD"
+			BUILD_FLAGS=-f gcc-3.0-freebsd.mak
+		.ELIF "$(OS)"=="MACOSX"
+			BUILD_FLAGS=-f gcc-3.0-macosx.mak
+		.ELSE
+			BUILD_FLAGS=-f gcc-3.0.mak
+		.ENDIF
+	.ELSE # "$(COMID)"=="gcc3"
+		# MacOS X/Darwin need a special makefile
+		.IF "$(OS)"=="MACOSX"
+			BUILD_FLAGS=-f gcc-apple-macosx.mak
+		.ELIF "$(OS)"=="FREEBSD"
+			BUILD_FLAGS=-f gcc-freebsd.mak
+		.ELSE # "$(OS)"=="MACOSX"
+			BUILD_FLAGS=-f gcc.mak
+		.ENDIF # "$(OS)"=="MACOSX"
+	.ENDIF # "$(COMID)"=="gcc3"
+	BUILD_ACTION=$(GNUMAKE)
+	# build in parallel
+	BUILD_FLAGS+= -j$(MAXPROCESS)
 .ENDIF
 
 .IF "$(COM)"=="C52"