[Python-checkins] python/dist/src Makefile.pre.in,1.134,1.135 configure.in,1.420,1.421 configure,1.409,1.410

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 04 Jul 2003 05:14:41 -0700


Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12931

Modified Files:
	Makefile.pre.in configure.in configure 
Log Message:
Fixed two bugs in MacOSX framework handling spotted by Edward Moy:

- In the top level Makefile, the argument to -install_name should be
  prepended with /System/Library/Frameworks/, so it is an absolute path.
- In the top level Makefile, because of 2), RUNSHARED needs to be set to
  DYLD_FRAMEWORK_PATH=<path to local framework> and $(RUNSHARED) prepended
  to the $(MAKE) lines in the frameworkinstallmaclib and
  frameworkinstallapps targets.



Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** Makefile.pre.in	21 Jun 2003 13:26:28 -0000	1.134
--- Makefile.pre.in	4 Jul 2003 12:14:38 -0000	1.135
***************
*** 859,863 ****
  frameworkinstallmaclib:
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
! 		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
  		srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) \
  		DESTDIR=$(DESTDIR)
--- 859,863 ----
  frameworkinstallmaclib:
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
! 		$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
  		srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) \
  		DESTDIR=$(DESTDIR)
***************
*** 866,870 ****
  frameworkinstallapps:
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
! 		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
  		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
  
--- 866,870 ----
  frameworkinstallapps:
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
! 		$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
  		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
  
***************
*** 879,883 ****
  frameworkinstallextras:
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installextras \
! 		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
  		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
  
--- 879,883 ----
  frameworkinstallextras:
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installextras \
! 		$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
  		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
  

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.420
retrieving revision 1.421
diff -C2 -d -r1.420 -r1.421
*** configure.in	2 Jul 2003 13:53:23 -0000	1.420
--- configure.in	4 Jul 2003 12:14:39 -0000	1.421
***************
*** 488,492 ****
  then
    LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
!   LDLIBRARYDIR='$(PYTHONFRAMEWORKDIR)'
    BLDLIBRARY=''
  else
--- 488,492 ----
  then
    LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
!   RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH"
    BLDLIBRARY=''
  else
***************
*** 1133,1142 ****
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
     	LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
!     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/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 $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
--- 1133,1142 ----
      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

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.409
retrieving revision 1.410
diff -C2 -d -r1.409 -r1.410
*** configure	2 Jul 2003 13:53:23 -0000	1.409
--- configure	4 Jul 2003 12:14:39 -0000	1.410
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.419 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53 for python 2.3.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.420 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53 for python 2.3.
***************
*** 3256,3260 ****
  then
    LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
!   LDLIBRARYDIR='$(PYTHONFRAMEWORKDIR)'
    BLDLIBRARY=''
  else
--- 3256,3260 ----
  then
    LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
!   RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH"
    BLDLIBRARY=''
  else
***************
*** 9467,9476 ****
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
     	LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
!     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/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 $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
--- 9467,9476 ----
      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