Kaydet (Commit) 4daf6adf authored tarafından Guido van Rossum's avatar Guido van Rossum

Added version number to destination.

Forget about the trick to create directories through dependencies --
it's impossible to get it right in the light of parallellizing Make
implementations and the inability to specify dependencies between
directories (because creating the subdirectory modifies the parent).
üst a63d9f4d
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
# brought up to date by running "make Makefile". (The makesetup also # brought up to date by running "make Makefile". (The makesetup also
# creates config.c from config.c.in in the source directory.) # creates config.c from config.c.in in the source directory.)
# Interpreter version number, for library destination pathnames
VERSION= 1.4
# === Variables set by makesetup === # === Variables set by makesetup ===
MODOBJS= _MODOBJS_ MODOBJS= _MODOBJS_
...@@ -41,7 +44,8 @@ SO= @SO@ ...@@ -41,7 +44,8 @@ SO= @SO@
LDSHARED= @LDSHARED@ LDSHARED= @LDSHARED@
CCSHARED= @CCSHARED@ CCSHARED= @CCSHARED@
LINKFORSHARED= @LINKFORSHARED@ LINKFORSHARED= @LINKFORSHARED@
DESTSHARED= $(exec_prefix)/lib/python/$(MACHDEP) BINLIBDEST= $(exec_prefix)/lib/python$(VERSION)
DESTSHARED= $(BINLIBDEST)/$(MACHDEP)
# Portable install script (configure doesn't always guess right) # Portable install script (configure doesn't always guess right)
INSTALL= @srcdir@/../install-sh -c INSTALL= @srcdir@/../install-sh -c
...@@ -193,19 +197,17 @@ asharedinstall: $(DESTSHARED) $(ASHAREDMODULE)$(SO) ...@@ -193,19 +197,17 @@ asharedinstall: $(DESTSHARED) $(ASHAREDMODULE)$(SO)
echodestshared: $(DESTSHARED) echodestshared: $(DESTSHARED)
echo $(DESTSHARED) echo $(DESTSHARED)
DIRMODE=755 DESTDIRS= $(exec_prefix) $(exec_prefix)/lib $(BINLIBDEST) $(DESTSHARED)
$(DESTSHARED): $(exec_prefix)/lib/python $(exec_prefix)/lib $(exec_prefix)
mkdir $(DESTSHARED); chmod $(DIRMODE) $(DESTSHARED)
$(exec_prefix)/lib/python:
mkdir $(exec_prefix)/lib/python
chmod $(DIRMODE) $(exec_prefix)/lib/python
$(exec_prefix)/lib: $(DESTSHARED):
mkdir $(exec_prefix)/lib; chmod $(DIRMODE) $(exec_prefix)/lib @for i in $(DESTDIRS); \
do \
$(exec_prefix): if test ! -d $$i; then \
mkdir $(exec_prefix); chmod $(DIRMODE) $(exec_prefix) echo "Creating directory $$i"; \
mkdir $$i; \
chmod 755 $$i; \
else true; \
fi; \
done
# Stuff is appended here by makesetup and make depend # Stuff is appended here by makesetup and make depend
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment