Index: makefile.mk
===================================================================
RCS file: /cvs/external/icu/makefile.mk,v
retrieving revision 1.10
diff -u -r1.10 makefile.mk
--- makefile.mk	1 Apr 2003 13:37:27 -0000	1.10
+++ makefile.mk	23 Apr 2003 00:37:11 -0000
@@ -74,7 +74,12 @@
 TARFILE_NAME=icu-2.2
 TARFILE_ROOTDIR=icu
 
+# There is an additional change to layout/Makefile.in to compile on MACOSX (fixed in icu 2.4)
+.IF "$(OS)"=="MACOSX"
+PATCH_FILE_NAME=icu-2.2.macosx.patch
+.ELSE
 PATCH_FILE_NAME=icu-2.2.patch
+.ENDIF			# "$(OS)"=="MACOSX"
 
 ADDITIONAL_FILES=source$/data$/brkitr$/edit_word.txt \
 		source$/data$/brkitr$/dict_word.txt \
@@ -106,23 +111,22 @@
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)
-
 OUT2LIB= \
-	$(BUILD_DIR)$/data$/out$/libicudata.so.22.0 \
-	$(BUILD_DIR)$/data$/out$/libicudata.so.22 \
-	$(BUILD_DIR)$/data$/out$/libicudata.so \
+	$(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST).22.0 \
+	$(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST).22 \
+	$(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST) \
 	$(BUILD_DIR)$/common$/libicuuc.a \
-	$(BUILD_DIR)$/common$/libicuuc.so.22.0 \
-	$(BUILD_DIR)$/common$/libicuuc.so.22 \
-	$(BUILD_DIR)$/common$/libicuuc.so \
+	$(BUILD_DIR)$/common$/libicuuc$(DLLPOST).22.0 \
+	$(BUILD_DIR)$/common$/libicuuc$(DLLPOST).22 \
+	$(BUILD_DIR)$/common$/libicuuc$(DLLPOST) \
 	$(BUILD_DIR)$/i18n$/libicui18n.a \
-	$(BUILD_DIR)$/i18n$/libicui18n.so.22.0 \
-	$(BUILD_DIR)$/i18n$/libicui18n.so.22 \
-	$(BUILD_DIR)$/i18n$/libicui18n.so \
+	$(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST).22.0 \
+	$(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST).22 \
+	$(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST) \
 	$(BUILD_DIR)$/layout$/libicule.a \
-	$(BUILD_DIR)$/layout$/libicule.so.22.0 \
-	$(BUILD_DIR)$/layout$/libicule.so.22 \
-	$(BUILD_DIR)$/layout$/libicule.so
+	$(BUILD_DIR)$/layout$/libicule$(DLLPOST).22.0 \
+	$(BUILD_DIR)$/layout$/libicule$(DLLPOST).22 \
+	$(BUILD_DIR)$/layout$/libicule$(DLLPOST)
 .ENDIF
 
 .IF "$(GUI)"=="WNT"