diff options
| author | Guido van Rossum <guido@python.org> | 1996-07-24 02:35:43 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1996-07-24 02:35:43 (GMT) |
| commit | 3912fd8781d0930174730f2c517ee44e3ab1880a (patch) | |
| tree | 949e880981b4f250635979f32d9675dbe13d05e6 | |
| parent | 4daf6adfe111af694af6152539567b59d09e29f1 (diff) | |
| download | cpython-3912fd8781d0930174730f2c517ee44e3ab1880a.zip cpython-3912fd8781d0930174730f2c517ee44e3ab1880a.tar.gz cpython-3912fd8781d0930174730f2c517ee44e3ab1880a.tar.bz2 | |
Append version number to library install directory.
"make libinstall" no longer implies "make sharedinstall".
"make altinstall" and "make altbininstall" install the python binary
with a version number, for tentative installations (this does not
install the include files or man page).
| -rw-r--r-- | Makefile.in | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index c2aee32..d044b9f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,6 +51,9 @@ # # See also the section "Build instructions" in the README file. +# Interpreter version number, for library destination pathnames +VERSION= 1.4 + # Substitutions by configure srcdir= @srcdir@ VPATH= @srcdir@ @@ -77,7 +80,7 @@ SO= @SO@ LDSHARED= @LDSHARED@ CCSHARED= @CCSHARED@ LINKFORSHARED= @LINKFORSHARED@ -DESTSHARED= $(SCRIPTDIR)/python/$(MACHDEP) +DESTSHARED= $(SCRIPTDIR)/python$(VERSION)/$(MACHDEP) # Shell used by make (some versions default to the login shell, which is bad) SHELL= /bin/sh @@ -131,6 +134,9 @@ test: python install: bininstall libinstall maninstall inclinstall \ libainstall sharedinstall +# Install most things with $(VERSION) affixed +altinstall: altbininstall libinstall libainstall sharedinstall + # Install the interpreter bininstall: python @for i in $(BINDIR); \ @@ -144,10 +150,23 @@ bininstall: python done $(INSTALL_PROGRAM) python $(BINDIR)/python +# Install the interpreter with $(VERSION) affixed +altbininstall: python + @for i in $(BINDIR); \ + do \ + if test ! -d $$i; then \ + echo "Creating directory $$i"; \ + mkdir $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done + $(INSTALL_PROGRAM) python $(BINDIR)/python$(VERSION) + # Install the library. # If your system does not support "cp -r", try "copy -r" or perhaps # something like find Lib -print | cpio -pacvdmu $(LIBDEST) -LIBDEST= $(SCRIPTDIR)/python +LIBDEST= $(SCRIPTDIR)/python$(VERSION) libinstall: python @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ @@ -161,14 +180,6 @@ libinstall: python cp -r $(srcdir)/Lib/* $(LIBDEST) PYTHONPATH=$(LIBDEST) \ ./python $(LIBDEST)/compileall.py $(LIBDEST) - $(MAKE) \ - OPT="$(OPT)" \ - SO="$(SO)" \ - LDSHARED="$(LDSHARED)" \ - CCSHARED="$(CCSHARED)" \ - LINKFORSHARED="$(LINKFORSHARED)" \ - DESTSHARED="$(DESTSHARED)" \ - sharedinstall # Install the manual page maninstall: @@ -239,6 +250,8 @@ sharedinstall: CCSHARED="$(CCSHARED)" \ LINKFORSHARED="$(LINKFORSHARED)" \ DESTSHARED="$(DESTSHARED)" \ + prefix="$(prefix)" \ + exec_prefix="$(exec_prefix)" \ sharedinstall # Build the sub-Makefiles |