Integrate installing a framework in the 'make install'
target. Until now users had to use 'make frameworkinstall' to install python when it is configured with '--enable-framework'. This tends to confuse users that don't hunt for readme files hidden in platform specific directories :-)
This commit is contained in:
Ronald Oussoren
parent
39be38c965
commit
567a8ffd09
|
|
@ -614,7 +614,7 @@ memtest: all platform
|
|||
$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
|
||||
|
||||
# Install everything
|
||||
install: altinstall bininstall maninstall
|
||||
install: @FRAMEWORKINSTALLFIRST@ altinstall bininstall maninstall @FRAMEWORKINSTALLLAST@
|
||||
|
||||
# Install almost everything without disturbing previous versions
|
||||
altinstall: altbininstall libinstall inclinstall libainstall \
|
||||
|
|
@ -899,8 +899,10 @@ sharedinstall:
|
|||
# subtargets install specific parts. Much of the actual work is offloaded to
|
||||
# the Makefile in Mac/OSX
|
||||
#
|
||||
frameworkinstall: frameworkinstallframework \
|
||||
frameworkinstallapps frameworkinstallunixtools
|
||||
#
|
||||
# This target is here for backward compatiblity, previous versions of Python
|
||||
# hadn't integrated framework installation in the normal install process.
|
||||
frameworkinstall: install
|
||||
|
||||
# On install, we re-make the framework
|
||||
# structure in the install location, /Library/Frameworks/ or the argument to
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 46010 .
|
||||
# From configure.in Revision: 46046 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for python 2.5.
|
||||
#
|
||||
|
|
@ -312,7 +312,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX MAINCC CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR SVNVERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX MAINCC CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR SVNVERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1443,6 +1443,8 @@ if test "${enable_framework+set}" = set; then
|
|||
PYTHONFRAMEWORKDIR=no-framework
|
||||
PYTHONFRAMEWORKPREFIX=
|
||||
PYTHONFRAMEWORKINSTALLDIR=
|
||||
FRAMEWORKINSTALLFIRST=
|
||||
FRAMEWORKINSTALLLAST=
|
||||
enable_framework=
|
||||
;;
|
||||
*)
|
||||
|
|
@ -1450,6 +1452,8 @@ if test "${enable_framework+set}" = set; then
|
|||
PYTHONFRAMEWORKDIR=Python.framework
|
||||
PYTHONFRAMEWORKPREFIX=$enableval
|
||||
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
|
||||
FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
|
||||
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
|
||||
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
|
||||
|
||||
# Add makefiles for Mac specific code to the list of output
|
||||
|
|
@ -1468,6 +1472,8 @@ else
|
|||
PYTHONFRAMEWORKDIR=no-framework
|
||||
PYTHONFRAMEWORKPREFIX=
|
||||
PYTHONFRAMEWORKINSTALLDIR=
|
||||
FRAMEWORKINSTALLFIRST=
|
||||
FRAMEWORKINSTALLLAST=
|
||||
enable_framework=
|
||||
|
||||
fi;
|
||||
|
|
@ -1476,6 +1482,8 @@ fi;
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
##AC_ARG_WITH(dyld,
|
||||
## AC_HELP_STRING(--with-dyld,
|
||||
## Use (OpenStep|Rhapsody) dynamic linker))
|
||||
|
|
@ -22541,6 +22549,8 @@ s,@PYTHONFRAMEWORK@,$PYTHONFRAMEWORK,;t t
|
|||
s,@PYTHONFRAMEWORKDIR@,$PYTHONFRAMEWORKDIR,;t t
|
||||
s,@PYTHONFRAMEWORKPREFIX@,$PYTHONFRAMEWORKPREFIX,;t t
|
||||
s,@PYTHONFRAMEWORKINSTALLDIR@,$PYTHONFRAMEWORKINSTALLDIR,;t t
|
||||
s,@FRAMEWORKINSTALLFIRST@,$FRAMEWORKINSTALLFIRST,;t t
|
||||
s,@FRAMEWORKINSTALLLAST@,$FRAMEWORKINSTALLLAST,;t t
|
||||
s,@MACHDEP@,$MACHDEP,;t t
|
||||
s,@SGI_ABI@,$SGI_ABI,;t t
|
||||
s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
|
||||
|
|
|
|||
|
|
@ -97,6 +97,8 @@ AC_ARG_ENABLE(framework,
|
|||
PYTHONFRAMEWORKDIR=no-framework
|
||||
PYTHONFRAMEWORKPREFIX=
|
||||
PYTHONFRAMEWORKINSTALLDIR=
|
||||
FRAMEWORKINSTALLFIRST=
|
||||
FRAMEWORKINSTALLLAST=
|
||||
enable_framework=
|
||||
;;
|
||||
*)
|
||||
|
|
@ -104,6 +106,8 @@ AC_ARG_ENABLE(framework,
|
|||
PYTHONFRAMEWORKDIR=Python.framework
|
||||
PYTHONFRAMEWORKPREFIX=$enableval
|
||||
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
|
||||
FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
|
||||
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
|
||||
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
|
||||
|
||||
# Add makefiles for Mac specific code to the list of output
|
||||
|
|
@ -117,12 +121,16 @@ AC_ARG_ENABLE(framework,
|
|||
PYTHONFRAMEWORKDIR=no-framework
|
||||
PYTHONFRAMEWORKPREFIX=
|
||||
PYTHONFRAMEWORKINSTALLDIR=
|
||||
FRAMEWORKINSTALLFIRST=
|
||||
FRAMEWORKINSTALLLAST=
|
||||
enable_framework=
|
||||
])
|
||||
AC_SUBST(PYTHONFRAMEWORK)
|
||||
AC_SUBST(PYTHONFRAMEWORKDIR)
|
||||
AC_SUBST(PYTHONFRAMEWORKPREFIX)
|
||||
AC_SUBST(PYTHONFRAMEWORKINSTALLDIR)
|
||||
AC_SUBST(FRAMEWORKINSTALLFIRST)
|
||||
AC_SUBST(FRAMEWORKINSTALLLAST)
|
||||
|
||||
##AC_ARG_WITH(dyld,
|
||||
## AC_HELP_STRING(--with-dyld,
|
||||
|
|
|
|||
Loading…
Reference in New Issue