diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-06 19:50:24 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-06 19:50:24 (GMT) |
| commit | 5b78732a20b1e8210cbc3bad7067e52fb969007f (patch) | |
| tree | 6bf65b7ec378cea8a8dac763a6323495cb6c9b8f /Makefile.pre.in | |
| parent | b1998bc860169c02a23fce874f538cf009d351de (diff) | |
| download | cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.zip cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.tar.gz cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.tar.bz2 | |
* 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)
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 566e5d4..3f37259 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -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 |