* Ensure that "make altinstall" works when the tree was configured
with --enable-framework * Also for --enable-framework: allow users to use --prefix to specify the location of the compatibility symlinks (such as /usr/local/bin/python)
This commit is contained in:
Ronald Oussoren
parent
b1998bc860
commit
5b78732a20
|
|
@ -10,6 +10,7 @@ LIBDEST=$(prefix)/lib/python$(VERSION)
|
|||
BUILDPYTHON=$(builddir)/python.exe
|
||||
DESTDIR=
|
||||
LDFLAGS= @LDFLAGS@
|
||||
FRAMEWORKUNIXTOOLSPREFIX=@FRAMEWORKUNIXTOOLSPREFIX@
|
||||
|
||||
# These are normally glimpsed from the previous set
|
||||
bindir=@exec_prefix@/bin
|
||||
|
|
@ -59,14 +60,30 @@ install_pythonw: pythonw
|
|||
# actual installation inside the framework.
|
||||
#
|
||||
installunixtools:
|
||||
if [ ! -d "$(DESTDIR)/usr/local/bin" ]; then \
|
||||
$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)/usr/local/bin" ;\
|
||||
if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \
|
||||
$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
|
||||
fi
|
||||
for fn in `ls "$(DESTDIR)$(prefix)/bin/"` ; \
|
||||
for fn in python pythonw idle pydoc python-config smtpd.py \
|
||||
python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
|
||||
pydoc$(VERSION) python-config$(VERSION) smtpd$(VERSION).py ;\
|
||||
do \
|
||||
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)/usr/local/bin/$${fn}" ;\
|
||||
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
|
||||
done
|
||||
|
||||
#
|
||||
# Like installunixtools, but only install links to the versioned binaries.
|
||||
#
|
||||
altinstallunixtools:
|
||||
if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \
|
||||
$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
|
||||
fi
|
||||
for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
|
||||
pydoc$(VERSION) python-config$(VERSION) smtpd$(VERSION).py ;\
|
||||
do \
|
||||
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
|
||||
done
|
||||
|
||||
|
||||
# By default most tools are installed without a version in their basename, to
|
||||
# make it easier to install (and use) several python versions side-by-side move
|
||||
# the tools to a version-specific name and add the non-versioned name as an
|
||||
|
|
@ -215,7 +232,7 @@ installmacsubtree:
|
|||
#
|
||||
# We use the full name here in stead of $(INSTALLED_PYTHONAPP), because
|
||||
# the latter may be overridden by Makefile.jaguar when building for a pre-installed
|
||||
$(INSTALLED_PYTHONAPP)/Contents/MacOS/Python: install_Python
|
||||
$(APPINSTALLDIR)/Contents/MacOS/Python: install_Python
|
||||
|
||||
# $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.
|
||||
# At least this rule will give an error if it doesn't exist.
|
||||
|
|
|
|||
|
|
@ -617,8 +617,8 @@ memtest: all platform
|
|||
install: @FRAMEWORKINSTALLFIRST@ altinstall bininstall maninstall @FRAMEWORKINSTALLLAST@
|
||||
|
||||
# Install almost everything without disturbing previous versions
|
||||
altinstall: altbininstall libinstall inclinstall libainstall \
|
||||
sharedinstall oldsharedinstall
|
||||
altinstall: @FRAMEWORKALTINSTALLFIRST@ altbininstall libinstall inclinstall libainstall \
|
||||
sharedinstall oldsharedinstall @FRAMEWORKALTINSTALLLAST@
|
||||
|
||||
# Install shared libraries enabled by Setup
|
||||
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
|
||||
|
|
@ -948,6 +948,9 @@ frameworkinstallapps:
|
|||
frameworkinstallunixtools:
|
||||
cd Mac/OSX && $(MAKE) installunixtools DESTDIR="$(DESTDIR)"
|
||||
|
||||
frameworkaltinstallunixtools:
|
||||
cd Mac/OSX && $(MAKE) altinstallunixtools DESTDIR="$(DESTDIR)"
|
||||
|
||||
# This installs the Demos and Tools into the applications directory.
|
||||
# It is not part of a normal frameworkinstall
|
||||
frameworkinstallextras:
|
||||
|
|
@ -1081,6 +1084,7 @@ Python/thread.o: @THREADHEADERS@
|
|||
.PHONY: maninstall libinstall inclinstall libainstall sharedinstall
|
||||
.PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
|
||||
.PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
|
||||
.PHONY: recheck autoconf clean clobber distclean smelly funny
|
||||
.PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
|
||||
.PHONY: smelly funny
|
||||
|
||||
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 46295 .
|
||||
# From configure.in Revision: 46608 .
|
||||
# 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 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_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 FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX 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.
|
||||
|
|
@ -1445,6 +1445,9 @@ if test "${enable_framework+set}" = set; then
|
|||
PYTHONFRAMEWORKINSTALLDIR=
|
||||
FRAMEWORKINSTALLFIRST=
|
||||
FRAMEWORKINSTALLLAST=
|
||||
FRAMEWORKALTINSTALLFIRST=
|
||||
FRAMEWORKALTINSTALLLAST=
|
||||
FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
|
||||
enable_framework=
|
||||
;;
|
||||
*)
|
||||
|
|
@ -1454,6 +1457,9 @@ if test "${enable_framework+set}" = set; then
|
|||
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
|
||||
FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
|
||||
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
|
||||
FRAMEWORKALTINSTALLFIRST="${FRAMEWORKINSTALLFIRST} bininstall maninstall"
|
||||
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
|
||||
FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
|
||||
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
|
||||
|
||||
# Add makefiles for Mac specific code to the list of output
|
||||
|
|
@ -1474,6 +1480,9 @@ else
|
|||
PYTHONFRAMEWORKINSTALLDIR=
|
||||
FRAMEWORKINSTALLFIRST=
|
||||
FRAMEWORKINSTALLLAST=
|
||||
FRAMEWORKALTINSTALLFIRST=
|
||||
FRAMEWORKALTINSTALLLAST=
|
||||
FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
|
||||
enable_framework=
|
||||
|
||||
fi;
|
||||
|
|
@ -1484,6 +1493,9 @@ fi;
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
##AC_ARG_WITH(dyld,
|
||||
## AC_HELP_STRING(--with-dyld,
|
||||
## Use (OpenStep|Rhapsody) dynamic linker))
|
||||
|
|
@ -22565,6 +22577,9 @@ s,@PYTHONFRAMEWORKPREFIX@,$PYTHONFRAMEWORKPREFIX,;t t
|
|||
s,@PYTHONFRAMEWORKINSTALLDIR@,$PYTHONFRAMEWORKINSTALLDIR,;t t
|
||||
s,@FRAMEWORKINSTALLFIRST@,$FRAMEWORKINSTALLFIRST,;t t
|
||||
s,@FRAMEWORKINSTALLLAST@,$FRAMEWORKINSTALLLAST,;t t
|
||||
s,@FRAMEWORKALTINSTALLFIRST@,$FRAMEWORKALTINSTALLFIRST,;t t
|
||||
s,@FRAMEWORKALTINSTALLLAST@,$FRAMEWORKALTINSTALLLAST,;t t
|
||||
s,@FRAMEWORKUNIXTOOLSPREFIX@,$FRAMEWORKUNIXTOOLSPREFIX,;t t
|
||||
s,@MACHDEP@,$MACHDEP,;t t
|
||||
s,@SGI_ABI@,$SGI_ABI,;t t
|
||||
s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
|
||||
|
|
|
|||
12
configure.in
12
configure.in
|
|
@ -99,6 +99,9 @@ AC_ARG_ENABLE(framework,
|
|||
PYTHONFRAMEWORKINSTALLDIR=
|
||||
FRAMEWORKINSTALLFIRST=
|
||||
FRAMEWORKINSTALLLAST=
|
||||
FRAMEWORKALTINSTALLFIRST=
|
||||
FRAMEWORKALTINSTALLLAST=
|
||||
FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
|
||||
enable_framework=
|
||||
;;
|
||||
*)
|
||||
|
|
@ -108,6 +111,9 @@ AC_ARG_ENABLE(framework,
|
|||
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
|
||||
FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
|
||||
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
|
||||
FRAMEWORKALTINSTALLFIRST="${FRAMEWORKINSTALLFIRST} bininstall maninstall"
|
||||
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
|
||||
FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
|
||||
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
|
||||
|
||||
# Add makefiles for Mac specific code to the list of output
|
||||
|
|
@ -123,6 +129,9 @@ AC_ARG_ENABLE(framework,
|
|||
PYTHONFRAMEWORKINSTALLDIR=
|
||||
FRAMEWORKINSTALLFIRST=
|
||||
FRAMEWORKINSTALLLAST=
|
||||
FRAMEWORKALTINSTALLFIRST=
|
||||
FRAMEWORKALTINSTALLLAST=
|
||||
FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
|
||||
enable_framework=
|
||||
])
|
||||
AC_SUBST(PYTHONFRAMEWORK)
|
||||
|
|
@ -131,6 +140,9 @@ AC_SUBST(PYTHONFRAMEWORKPREFIX)
|
|||
AC_SUBST(PYTHONFRAMEWORKINSTALLDIR)
|
||||
AC_SUBST(FRAMEWORKINSTALLFIRST)
|
||||
AC_SUBST(FRAMEWORKINSTALLLAST)
|
||||
AC_SUBST(FRAMEWORKALTINSTALLFIRST)
|
||||
AC_SUBST(FRAMEWORKALTINSTALLLAST)
|
||||
AC_SUBST(FRAMEWORKUNIXTOOLSPREFIX)
|
||||
|
||||
##AC_ARG_WITH(dyld,
|
||||
## AC_HELP_STRING(--with-dyld,
|
||||
|
|
|
|||
Loading…
Reference in New Issue