summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2006-05-26 11:43:26 +0000
committerRonald Oussoren <ronaldoussoren@mac.com>2006-05-26 11:43:26 +0000
commitd7bbb62941a052df17bdaa750b964b63b82ac5fb (patch)
tree82a631573118fb432389038909fbc3b81f2a8bec /configure.in
parentabc16da2d84798c545d1ca170ffb83885678fb59 (diff)
downloadcpython-d7bbb62941a052df17bdaa750b964b63b82ac5fb.tar.gz
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 :-)
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index a7c50bd013..010844e440 100644
--- a/configure.in
+++ b/configure.in
@@ -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,