diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2004-07-16 08:43:47 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2004-07-16 08:43:47 (GMT) |
| commit | b36687a4833ac3a49cea0342ec3b197ea583b835 (patch) | |
| tree | 2973259f3c309e4cd56bb6634783ba3b04edb426 | |
| parent | 6c09a21f6660eb9aea0a0dd61fbb2682611cb24b (diff) | |
| download | cpython-b36687a4833ac3a49cea0342ec3b197ea583b835.zip cpython-b36687a4833ac3a49cea0342ec3b197ea583b835.tar.gz cpython-b36687a4833ac3a49cea0342ec3b197ea583b835.tar.bz2 | |
Don't hardcode "Python" as the framework name, we have a variable for it:
$PYTHONFRAMEWORK.
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.in | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 10a3f45..e7220b6 100644 --- 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 @@ -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 5503a17..77522c3 100644 --- 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";; |