Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b36687a

Browse files
jackjansenjackjansen
committed
Don't hardcode "Python" as the framework name, we have a variable for it:
$PYTHONFRAMEWORK.
1 parent 6c09a21 commit b36687a

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎Makefile.pre.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
381381
$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
382382
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj/InfoPlist.strings
383383
$(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
384-
$(LN) -fsn Versions/Current/Python $(PYTHONFRAMEWORKDIR)/Python
384+
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
385385
$(LN) -fsn Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers
386386
$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
387387

‎configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 1.460 .
2+
# From configure.in Revision: 1.462 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.57 for python 2.4.
55
#
@@ -9340,12 +9340,12 @@ case $ac_sys_system/$ac_sys_release in
93409340
Darwin/1.3*)
93419341
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
93429342
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
9343-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
9343+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
93449344
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
93459345
Darwin/*)
93469346
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
93479347
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
9348-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
9348+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
93499349
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
93509350
esac
93519351

@@ -9575,7 +9575,7 @@ then
95759575
LINKFORSHARED="$extra_undefs -framework System"
95769576
if test "$enable_framework"
95779577
then
9578-
LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python"
9578+
LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
95799579
fi
95809580
LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
95819581
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;

‎configure.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,12 +1180,12 @@ case $ac_sys_system/$ac_sys_release in
11801180
Darwin/1.3*)
11811181
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
11821182
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
1183-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
1183+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
11841184
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
11851185
Darwin/*)
11861186
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
11871187
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
1188-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
1188+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
11891189
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
11901190
esac
11911191

@@ -1399,7 +1399,7 @@ then
13991399
LINKFORSHARED="$extra_undefs -framework System"
14001400
if test "$enable_framework"
14011401
then
1402-
LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python"
1402+
LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
14031403
fi
14041404
LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
14051405
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;

0 commit comments

Comments
 (0)