summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-07-30 16:53:14 (GMT)
committerGuido van Rossum <guido@python.org>1996-07-30 16:53:14 (GMT)
commit704fef226875aa51b35791ac0b121fef709e995a (patch)
treee99b58964f1329daeefcaecaff53bc0392097e62
parent8861b74445560c078d11ff6800a3ce20a869ea93 (diff)
downloadcpython-704fef226875aa51b35791ac0b121fef709e995a.zip
cpython-704fef226875aa51b35791ac0b121fef709e995a.tar.gz
cpython-704fef226875aa51b35791ac0b121fef709e995a.tar.bz2
Refinements to installation, now uses $(VERSION) etc.
-rw-r--r--Modules/Makefile.pre.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 40fc16d..05479f6 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -44,12 +44,13 @@ SO= @SO@
LDSHARED= @LDSHARED@
CCSHARED= @CCSHARED@
LINKFORSHARED= @LINKFORSHARED@
-BINLIBDEST= $(exec_prefix)/lib/python$(VERSION)
-DESTSHARED= $(BINLIBDEST)/$(MACHDEP)
+LIBDIR= $(exec_prefix)/lib
+BINLIBDEST= $(LIBDIR)/python$(VERSION)
+DESTSHARED= $(BINLIBDEST)/sharedmodules
# Portable install script (configure doesn't always guess right)
INSTALL= @srcdir@/../install-sh -c
-INSTALL_PROGRAM=${INSTALL}
+INSTALL_PROGRAM=${INSTALL} -m 755
INSTALL_DATA= ${INSTALL} -m 644
# === Variables that are customizable by hand or by inclusion in Setup ===
@@ -197,7 +198,7 @@ asharedinstall: $(DESTSHARED) $(ASHAREDMODULE)$(SO)
echodestshared: $(DESTSHARED)
echo $(DESTSHARED)
-DESTDIRS= $(exec_prefix) $(exec_prefix)/lib $(BINLIBDEST) $(DESTSHARED)
+DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
$(DESTSHARED):
@for i in $(DESTDIRS); \