From 704fef226875aa51b35791ac0b121fef709e995a Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 30 Jul 1996 16:53:14 +0000
Subject: [PATCH] Refinements to installation, now uses $(VERSION) etc.

---
 Modules/Makefile.pre.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 40fc16d8486..05479f6d9ca 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); \