Don't hardcode "Python" as the framework name, we have a variable for it:

$PYTHONFRAMEWORK.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 10a3f4563968f28a6ab98810252baf9de1900c9c..e7220b6c7c4e7fc29df273e9afe41efeb54bcc89 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -381,7 +381,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
        $(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
                $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj/InfoPlist.strings
        $(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
-       $(LN) -fsn Versions/Current/Python $(PYTHONFRAMEWORKDIR)/Python
+       $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
        $(LN) -fsn Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers
        $(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
 

diff --git a/configure b/configure
index 49b0eb2c08a2fbc2f0962d10a52b24b44447c1a3..30aeb3fd8727b555965a9d22489eb3ce87b3b0ed 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.460 .
+# From configure.in Revision: 1.462 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57 for python 2.4.
 #
@@ -9340,12 +9340,12 @@ case $ac_sys_system/$ac_sys_release in
   Darwin/1.3*)
     LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
        LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
+    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
   Darwin/*)
     LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
       LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
+    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 esac
 
@@ -9575,7 +9575,7 @@ then
                LINKFORSHARED="$extra_undefs -framework System"
                if test "$enable_framework"
                then
-                       LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python"
+                       LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
                fi
                LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
        OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;

diff --git a/configure.in b/configure.in
index 5503a17207e09a3c5b38a9e5daa383b533d9586b..77522c35f69d69c40bd08d93a8d554e63cbee751 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1180,12 +1180,12 @@ case $ac_sys_system/$ac_sys_release in
   Darwin/1.3*)
     LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
        LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
+    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
   Darwin/*)
     LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
       LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
+    LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 esac
 
@@ -1399,7 +1399,7 @@ then
                LINKFORSHARED="$extra_undefs -framework System"
                if test "$enable_framework"
                then
-                       LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python"
+                       LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
                fi
                LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
        OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;