--- source/makefile.mk.orig	Wed Jun  8 08:22:32 2005
+++ source/makefile.mk	Wed Jun  8 08:26:53 2005
@@ -139,16 +139,33 @@
 
 APP2TARGET= helpex
 APP2OBJS= $(OBJ)$/helpmerge.obj  $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj $(OBJ)$/merge.obj $(OBJ)$/helpex.obj $(OBJ)$/hw2fw.obj
-APP2STDLIBS=$(BTSTRPLIB) $(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB)
+
+.IF "$(OS)"!="MACOSX"
+APP2STDLIBS+= $(BTSTRPLIB)
+.ENDIF
+
+APP2STDLIBS=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB)
+
+.IF "$(OS)"=="MACOSX"
+# static libs at end for OS X
+APP2STDLIBS+= $(BTSTRPLIB)
+.ENDIF
 
 # extractor and merger for *.lng and *.lng
 APP3TARGET= ulfex
 APP3OBJS=   $(OBJ)$/lngmerge.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj $(OBJ)$/utf8conv.obj
+
+.IF "$(OS)"!="MACOSX"
+APP3STDLIBS+= $(BTSTRPLIB)
+.ENDIF
 APP3STDLIBS+= \
-            $(BTSTRPLIB) \
             $(TOOLSLIB) \
             $(VOSLIB) \
             $(SALLIB)
+.IF "$(OS)"=="MACOSX"
+# static libs at end for OS X
+APP3STDLIBS+= $(BTSTRPLIB)
+.ENDIF
 
 # encoding converter for *.gsi
 APP4TARGET= gsiconv
@@ -172,29 +189,37 @@
 APP6TARGET= cfgex
 APP6OBJS=   $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
 
-#.IF "$(OS)"!="MACOSX"
-#APP6STDLIBS+= $(BTSTRPLIB)
-#.ENDIF
+.IF "$(OS)"!="MACOSX"
+APP6STDLIBS+= $(BTSTRPLIB)
+.ENDIF
 
 APP6STDLIBS+= \
-            $(BTSTRPLIB) \
             $(TOOLSLIB) \
             $(VOSLIB) \
             $(SALLIB)
 
+.IF "$(OS)"=="MACOSX"
+# static libs at end for OS X
+APP6STDLIBS+= $(BTSTRPLIB)
+.ENDIF
+
 # extractor and merger for *.xrm
 APP7TARGET= xrmex
 APP7OBJS=   $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
 
-#.IF "$(OS)"!="MACOSX"
-#APP7STDLIBS+= $(BTSTRPLIB)
-#.ENDIF
+.IF "$(OS)"!="MACOSX"
+APP7STDLIBS+= $(BTSTRPLIB)
+.ENDIF
 
 APP7STDLIBS+= \
-            $(BTSTRPLIB) \
             $(TOOLSLIB) \
             $(VOSLIB) \
             $(SALLIB)
+
+.IF "$(OS)"=="MACOSX"
+# static libs at end for OS X
+APP7STDLIBS+= $(BTSTRPLIB)
+.ENDIF
 
 #APP8TARGET=  sdfupdate
 #APP8OBJS= $(OBJ)$/sdfupdate.obj