[Python-checkins] python/dist/src configure.in, 1.461, 1.462 Makefile.pre.in, 1.146, 1.147

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29326

Modified Files:
	configure.in Makefile.pre.in 
Log Message:
Don't hardcode "Python" as the framework name, we have a variable for it:
$PYTHONFRAMEWORK.


Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.461
retrieving revision 1.462
diff -C2 -d -r1.461 -r1.462
*** configure.in	7 Jul 2004 17:44:09 -0000	1.461
--- configure.in	16 Jul 2004 08:42:35 -0000	1.462
***************
*** 1181,1190 ****
      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' -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' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
--- 1181,1190 ----
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
     	LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
!     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)/$(PYTHONFRAMEWORK)'
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
***************
*** 1400,1404 ****
  		if test "$enable_framework"
  		then
! 			LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python"
  		fi
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
--- 1400,1404 ----
  		if test "$enable_framework"
  		then
! 			LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
  		fi
  		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;

Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** Makefile.pre.in	12 Jul 2004 09:25:18 -0000	1.146
--- Makefile.pre.in	16 Jul 2004 08:42:35 -0000	1.147
***************
*** 382,386 ****
  		$(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/Headers $(PYTHONFRAMEWORKDIR)/Headers
  	$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
--- 382,386 ----
  		$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj/InfoPlist.strings
  	$(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
! 	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
  	$(LN) -fsn Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers
  	$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources