1.1 --- a/moinsetup.py Sat Sep 17 00:12:44 2011 +0200
1.2 +++ b/moinsetup.py Sat Sep 17 01:27:01 2011 +0200
1.3 @@ -320,7 +320,8 @@
1.4 )
1.5
1.6 source_config_names = (
1.7 - "moin_distribution", "prefix", "site_packages", "htdocs_dir_source"
1.8 + "moin_distribution", "prefix", "site_packages", "prefix_site_packages",
1.9 + "htdocs_dir_source"
1.10 )
1.11
1.12 instance_config_names = (
1.13 @@ -545,6 +546,15 @@
1.14 return self.moin_distribution and join(self.moin_distribution, "wiki") or \
1.15 self.prefix and join(self.prefix, "share", "moin") or None
1.16
1.17 + def get_wikiconfig_directory(self):
1.18 +
1.19 + "Return the location of the Wiki configuration."
1.20 +
1.21 + if self.site_config:
1.22 + return split(self.site_config)[0]
1.23 + else:
1.24 + return self.common_dir
1.25 +
1.26 def get_static_identifier(self):
1.27
1.28 "Return the static URL/directory identifier for the Wiki."
1.29 @@ -1100,7 +1110,10 @@
1.30
1.31 this_dir = os.getcwd()
1.32 os.chdir(extension_dir)
1.33 - os.system("python setup.py install --prefix=%s" % self.prefix)
1.34 +
1.35 + options = "install --install-lib=%s" % self.prefix_site_packages
1.36 +
1.37 + os.system("python setup.py %s" % options)
1.38 os.chdir(this_dir)
1.39
1.40 def install_plugins(self, plugins_dir, plugin_type):
1.41 @@ -1291,10 +1304,12 @@
1.42
1.43 path = os.environ.get("PYTHONPATH", "")
1.44
1.45 + conf_dir = self.get_wikiconfig_directory()
1.46 +
1.47 if path:
1.48 - os.environ["PYTHONPATH"] = path + ":" + self.prefix_site_packages + ":" + self.common_dir
1.49 + os.environ["PYTHONPATH"] = path + ":" + self.prefix_site_packages + ":" + conf_dir
1.50 else:
1.51 - os.environ["PYTHONPATH"] = self.prefix_site_packages + ":" + self.common_dir
1.52 + os.environ["PYTHONPATH"] = self.prefix_site_packages + ":" + conf_dir
1.53
1.54 installer = join(self.prefix_site_packages, "MoinMoin", "packages.py")
1.55 cmd = "python %s i %s" % (installer, package_filename)