Fix Python install warnings

python/config/Make.rules

@@ -58,7 +58,7 @@ python_cppflags         := $(filter-out -Wunreachable-code -Wstrict-prototypes,$
 #
 # Python installation directory
 #
-install_pythondir       = $(or $(PYTHON_INSTALLDIR),$(if $(usr_dir_install),$(shell $(PYTHON) $(lang_srcdir)/config/install_dir),$(prefix)/python))
+install_pythondir       = $(or $(PYTHON_INSTALLDIR),$(shell $(PYTHON) $(lang_srcdir)/config/install_dir $(prefix)))
 
 #
 # Rules to build a python module. We just compute the name of the python module

python/config/install_dir

@@ -2,30 +2,26 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 
-from setuptools.command.easy_install import easy_install
-class easy_install_default(easy_install):
-  """ class easy_install had problems with the fist parameter not being
-      an instance of Distribution, even though it was. This is due to
-      some import-related mess.
-      """
+import os
+import site
+import sys
 
-  def __init__(self):
-    from distutils.dist import Distribution
-    dist = Distribution()
-    self.distribution = dist
-    self.initialize_options()
-    self._dry_run = None
-    self.verbose = dist.verbose
-    self.force = None
-    self.help = 0
-    self.finalized = 0
+if len(sys.argv) != 2:
+   print("Usage: {} [prefix]".format(sys.argv[0]))
+   sys.exit(1)
 
-e = easy_install_default()
-import os, distutils.errors
-try:
-  e.finalize_options()
-except distutils.errors.DistutilsError:
-  pass
+prefix = sys.argv[1]
+libdir = os.path.join(prefix, "lib")
 
-# Place the source files and the extension in a subdirectory of the installation directory.
-print(e.install_dir)
+for dir in site.getsitepackages():
+    if dir.startswith(libdir):
+       print(dir)
+       sys.exit(0)
+
+
+for dir in site.getsitepackages():
+    if dir.startswith(prefix):
+       print(dir)
+       sys.exit(0)
+
+print(os.path.join(prefix, "python"))

scripts/IceStormUtil.py

@@ -27,8 +27,8 @@ def getExe(self, current):
 
     def setup(self, current):
         # Create the database directory
+        self.dbdir = os.path.join(current.testsuite.getPath(), "{0}-{1}.db".format(self.instanceName, self.replica))
         if self.createDb:
-            self.dbdir = os.path.join(current.testsuite.getPath(), "{0}-{1}.db".format(self.instanceName, self.replica))
             if os.path.exists(self.dbdir):
                 shutil.rmtree(self.dbdir)
             os.mkdir(self.dbdir)