[Zope-Checkins] CVS: Zope/inst - configure.py:1.1.4.3

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv27569

Modified Files:
      Tag: new-install-branch
	configure.py 
Log Message:
Minor cleanups for consistency and readability.


=== Zope/inst/configure.py 1.1.4.2 => 1.1.4.3 ===
--- Zope/inst/configure.py:1.1.4.2	Fri Feb 14 11:19:41 2003
+++ Zope/inst/configure.py	Fri Feb 14 12:57:33 2003
@@ -13,21 +13,24 @@
 """
 Create a Makefile for building and installing Zope.
 """
-import getopt, sys, os
+import getopt
+import os
+import sys
+
 import versions
 
 if sys.platform == 'win32':
-    TARGET_DIR = 'c:\\Zope'
+    TARGET_DIR = 'c:\\Zope-' + versions.ZOPE_MAJOR_VERSION
     IN_MAKEFILE = 'Makefile.win.in'
     MAKE_COMMAND='the Visual C++ batch file "VCVARS32.bat" and then "nmake build"'
 else:
-    TARGET_DIR = '/opt/Zope-%s' % versions.ZOPE_MAJOR_VERSION
+    TARGET_DIR = '/opt/Zope-' + versions.ZOPE_MAJOR_VERSION
     IN_MAKEFILE = 'Makefile.in'
     MAKE_COMMAND='make'
 
 def main():
     # below assumes this script is in the BUILD_DIR/inst directory
-    BUILD_DIR=os.path.abspath(os.path.split(os.path.dirname(sys.argv[0]))[0])
+    BUILD_DIR=os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0])))
     PYTHON=sys.executable
     MAKEFILE=open(os.path.join(BUILD_DIR, 'inst', IN_MAKEFILE)).read()
     REQUIRE_LF_ENABLED = 1