Index: makefile.mk
===================================================================
RCS file: /cvs/external/python/makefile.mk,v
retrieving revision 1.3.2.2
diff -u -r1.3.2.2 makefile.mk
--- makefile.mk	24 Jun 2003 13:04:02 -0000	1.3.2.2
+++ makefile.mk	10 Jul 2003 14:46:35 -0000
@@ -80,9 +80,15 @@
 .IF "$(GUI)" == "UNX"
 CONFIGURE_ACTION= ./configure --prefix=../python-inst
 BUILD_ACTION=make ; make install
-PYTHONCORESHL=$(OUT)$/lib$/libpython.so.$(PYVERSION)
-PYTHONCORELINK1=$(OUT)$/lib$/libpython.so.$(PYMAJOR)
-PYTHONCORELINK2=$(OUT)$/lib$/libpython.so
+.IF "$(OS)"=="MACOSX"
+PYTHONCORESHL=$(OUT)$/lib$/$(DLLPRE)python$(PYMAJOR)$(PYMINOR)$(DLLPOST)
+PYTHONCORELINK1=$(OUT)$/lib$/$(DLLPRE)python$(PYMAJOR)$(DLLPOST)
+PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
+.ELSE
+PYTHONCORESHL=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST).$(PYVERSION)
+PYTHONCORELINK1=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST).$(PYMAJOR)
+PYTHONCORELINK2=$(OUT)$/lib$/$(DLLPRE)python$(DLLPOST)
+.ENDIF
 .ELSE
 BUILD_DIR=PCBuild
 .IF "$(COMEX)"=="8"
@@ -139,25 +145,37 @@
 #.ENDIF
 
 .IF "$(GUI)" == "UNX"
-$(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+$(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
 # Just to get the dependency right for SMP builds
 	@echo nothing do do
 
-$(PYTHONCORESHL) : $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a makefile.mk 
+$(PYTHONCORESHL) : $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a makefile.mk 
 .IF "$(OS)" == "SOLARIS"
-	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a -h $(DLLPRE)python.so.$(PYMAJOR) -lm -ldl -lc -lpthread
 .ELSE
 	echo "$(OS)"
-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -ldl -lutil -lc -lpthread
+	.IF "$(OS)" == "MACOSX"
+		cp $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(OUT)$/lib
+	.ELSE
+		ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/$(DLLPRE)python$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname $(DLLPRE)python.$(DLLPOST).$(PYMAJOR)  -lm -ldl -lutil -lc -lpthread
+	.ENDIF
 .ENDIF
 
 $(PYTHONCORELINK1) : makefile.mk $(PYTHONCORESHL)
 	-rm -f $@
-	cd $(OUT)$/lib && ln -s libpython.so.$(PYVERSION) libpython.so.$(PYMAJOR)
+.IF "$(OS)" == "MACOSX"
+	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(PYMAJOR)$(DLLPOST)
+.ELSE
+	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST).$(PYMAJOR)
+.ENDIF
 
 $(PYTHONCORELINK2) : makefile.mk $(PYTHONCORESHL)
 	-rm -f $@
-	cd $(OUT)$/lib && ln -s libpython.so.$(PYVERSION) libpython.so
+.IF "$(OS)" == "MACOSX"
+	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(PYMAJOR).$(PYMINOR)$(DLLPOST) $(DLLPRE)python$(DLLPOST)
+.ELSE
+	cd $(OUT)$/lib && ln -s $(DLLPRE)python$(DLLPOST).$(PYVERSION) $(DLLPRE)python$(DLLPOST)
+.ENDIF
 .ENDIF
 
 $(PYVERSIONFILE) : pyversion.mk
Index: prj/d.lst
===================================================================
RCS file: /cvs/external/python/prj/d.lst,v
retrieving revision 1.1
diff -u -r1.1 d.lst
--- prj/d.lst	31 Mar 2003 14:08:05 -0000	1.1
+++ prj/d.lst	10 Jul 2003 14:46:35 -0000
@@ -51,6 +51,7 @@
 ..\%__SRC%\misc\build\python-inst\lib\python2.2\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
 ..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
 ..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2
+..\%__SRC%\lib\libpython*.dylib %_DEST%\lib%_EXT%\libpython*.dylib
 
 # WINDOWS ONLY !
 ..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h