Collect together all detailed installation directories.
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 05479f6..cd53ae6 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -39,13 +39,24 @@
# Install prefix for architecture-dependent files
exec_prefix= @exec_prefix@
+# Expanded directories
+BINDIR= $(exec_prefix)/bin
+LIBDIR= $(exec_prefix)/lib
+MANDIR= $(prefix)/man
+INCLUDEDIR= $(prefix)/include
+SCRIPTDIR= $(prefix)/lib
+
+# Detailed destination directories
+BINLIBDEST= $(LIBDIR)/python$(VERSION)
+LIBDEST= $(SCRIPTDIR)/python$(VERSION)
+INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
+LIBP= $(LIBDIR)/python$(VERSION)
+
# Symbols used for using shared libraries
SO= @SO@
LDSHARED= @LDSHARED@
CCSHARED= @CCSHARED@
LINKFORSHARED= @LINKFORSHARED@
-LIBDIR= $(exec_prefix)/lib
-BINLIBDEST= $(LIBDIR)/python$(VERSION)
DESTSHARED= $(BINLIBDEST)/sharedmodules
# Portable install script (configure doesn't always guess right)