Commit 8f4af096 authored by Guido van Rossum's avatar Guido van Rossum

Refinements to installation, now uses $(VERSION) etc.

parent 1c4524d3
...@@ -44,12 +44,13 @@ SO= @SO@ ...@@ -44,12 +44,13 @@ SO= @SO@
LDSHARED= @LDSHARED@ LDSHARED= @LDSHARED@
CCSHARED= @CCSHARED@ CCSHARED= @CCSHARED@
LINKFORSHARED= @LINKFORSHARED@ LINKFORSHARED= @LINKFORSHARED@
BINLIBDEST= $(exec_prefix)/lib/python$(VERSION) LIBDIR= $(exec_prefix)/lib
DESTSHARED= $(BINLIBDEST)/$(MACHDEP) BINLIBDEST= $(LIBDIR)/python$(VERSION)
DESTSHARED= $(BINLIBDEST)/sharedmodules
# 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
INSTALL_PROGRAM=${INSTALL} INSTALL_PROGRAM=${INSTALL} -m 755
INSTALL_DATA= ${INSTALL} -m 644 INSTALL_DATA= ${INSTALL} -m 644
# === Variables that are customizable by hand or by inclusion in Setup === # === Variables that are customizable by hand or by inclusion in Setup ===
...@@ -197,7 +198,7 @@ asharedinstall: $(DESTSHARED) $(ASHAREDMODULE)$(SO) ...@@ -197,7 +198,7 @@ asharedinstall: $(DESTSHARED) $(ASHAREDMODULE)$(SO)
echodestshared: $(DESTSHARED) echodestshared: $(DESTSHARED)
echo $(DESTSHARED) echo $(DESTSHARED)
DESTDIRS= $(exec_prefix) $(exec_prefix)/lib $(BINLIBDEST) $(DESTSHARED) DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
$(DESTSHARED): $(DESTSHARED):
@for i in $(DESTDIRS); \ @for i in $(DESTDIRS); \
......
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