changed to use Lib/bundlebuilder.py instead of scripts/buildappbundle.py

diff --git a/Mac/OSX/Makefile.jaguar b/Mac/OSX/Makefile.jaguar
index 42dde6bc0e64ba9cbca089d3ee7e9ca2b44101d0..4699449352fb24d50dd0b0959ac0d76b3e4b6b42 100644 (file)
--- a/Mac/OSX/Makefile.jaguar
+++ b/Mac/OSX/Makefile.jaguar
@@ -19,8 +19,9 @@ datadir=$(PYTHONAPPSDIR)/python-additions
 MACLIBDEST=$(datadir)/Lib
 MACDYNLIBDEST=$(datadir)/lib-dynload
 MACTOOLSDEST=$(datadir)/Tools
-APPINSTALLDIR=$(datadir)/Python.app
-INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
+APPNAME=Python
+APPBUNDLENAME=$(APPNAME).app
+INSTALLED_PYTHONW=$(datadir)/$(APPBUNDLENAME)/Contents/MacOS/$(APPNAME)
 
 # The usual stuff
 DIRMODE=755
@@ -66,11 +67,13 @@ install_dynlib:
        touch $(MACDYNLIBDEST)/OverrideFrom23/__init__.py
                
 install_Python:
-       $(PYTHON) $(srcdir)/Mac/scripts/buildappbundle.py -l \
-               -o $(APPINSTALLDIR) \
+       $(PYTHON) $(srcdir)/Mac/Lib/bundlebuilder.py -q --link-exec \
+               -b $(datadir) \
+               -n $(APPBUNDLENAME) \
                -r $(srcdir)/Mac/OSXResources/app/Resources/Applet-Info.plist \
                -r $(srcdir)/Mac/OSXResources/app/Resources/PythonApplet.icns \
-               $(PYTHON)
+               -e $(PYTHON) \
+               build
                
 install_IDE:
        $(MAKE) -f $(osxdir)/Makefile install_IDE \