Index: prj/d.lst
===================================================================
RCS file: /cvs/udk/pyuno/prj/d.lst,v
retrieving revision 1.3
diff -u -r1.3 d.lst
--- prj/d.lst	24 May 2003 23:39:52 -0000	1.3
+++ prj/d.lst	31 Jul 2003 18:57:38 -0000
@@ -1,6 +1,9 @@
 ..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so
+..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib
 ..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so
+..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib
 ..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so
+..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib
 ..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py
 ..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py
 ..\%__SRC%\lib\uno.py %_DEST%\lib%_EXT%\uno.py
Index: source/loader/makefile.mk
===================================================================
RCS file: /cvs/udk/pyuno/source/loader/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- source/loader/makefile.mk	18 May 2003 13:31:54 -0000	1.3
+++ source/loader/makefile.mk	31 Jul 2003 18:57:38 -0000
@@ -129,7 +129,15 @@
 $(DLLDEST)$/%.py: %.py
 	+cp $? $@
 
+# For Mac OS X,
+# The python loader component is linked against libpyuno.dylib,
+# which hasn't been delivered yet but dyld needs to know where it is
+# so regcomp can load the component.
 $(DLLDEST)$/pyuno_services.rdb : makefile.mk
 	-rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb
+.IF "$(OS)"=="MACOSX"
+	+cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"
+.ELSE
 	+cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))
+.ENDIF    # $(OS)=="MACOSX"
 	+cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb
Index: source/module/makefile.mk
===================================================================
RCS file: /cvs/udk/pyuno/source/module/makefile.mk,v
retrieving revision 1.2.6.1
diff -u -r1.2.6.1 makefile.mk
--- source/module/makefile.mk	22 Jul 2003 17:16:08 -0000	1.2.6.1
+++ source/module/makefile.mk	31 Jul 2003 18:57:38 -0000
@@ -78,7 +78,7 @@
 # so this library cannot be checked
 SHL1NOCHECK=yes
 PYUNORC=pyunorc
-.IF "$(OS)"=="SOLARIS"
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX"
 PYTHONLIB=-lpython
 .ENDIF
 .ELSE
@@ -140,6 +140,8 @@
 	ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
 .ELIF "$(OS)" == "FREEBSD"
 	ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+.ELIF "$(OS)" == "MACOSX"
+	$(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
 .ENDIF
 .ENDIF
 
Index: zipcore/makefile.mk
===================================================================
RCS file: /cvs/udk/pyuno/zipcore/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- zipcore/makefile.mk	2 Jul 2003 15:19:02 -0000	1.3
+++ zipcore/makefile.mk	31 Jul 2003 18:57:38 -0000
@@ -29,7 +29,9 @@
 
 $(BIN)$/python-core-$(PYVERSION).zip : $(FILES)
 .IF "$(GUI)" == "UNX"
-	cd $(BIN) && find . -name '*.so' | xargs strip 
+.IF "$(OS)" != "MACOSX"
+	cd $(BIN) && find . -name '*$(DLLPOST)' | xargs $(STRIP) 
+.ENDIF
 .ENDIF
 	-rm -f $@
 	+cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME)
Index: zipcore/python.sh
===================================================================
RCS file: /cvs/udk/pyuno/zipcore/python.sh,v
retrieving revision 1.2
diff -u -r1.2 python.sh
--- zipcore/python.sh	6 Apr 2003 19:51:28 -0000	1.2
+++ zipcore/python.sh	31 Jul 2003 18:57:38 -0000
@@ -111,6 +111,11 @@
     export LD_LIBRARYN32_PATH
     ;;
 
+  darwin*)
+    DYLD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$DYLD_LIBRARY_PATH
+    export DYLD_LIBRARY_PATH
+    ;;
+
   *)
     LD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$LD_LIBRARY_PATH
     export LD_LIBRARY_PATH