1.1 --- a/moinsetup.py Wed Oct 30 15:33:44 2013 +0100
1.2 +++ b/moinsetup.py Sat Nov 09 22:27:18 2013 +0100
1.3 @@ -31,7 +31,7 @@
1.4 import sys
1.5 import tempfile
1.6
1.7 -__version__ = "0.4"
1.8 +__version__ = "0.4.1"
1.9
1.10 # Regular expressions for editing MoinMoin scripts and configuration files.
1.11
1.12 @@ -522,8 +522,8 @@
1.13
1.14 # Define the place where the MoinMoin package will actually reside.
1.15
1.16 - if not self.prefix and not self.site_packages:
1.17 - raise TypeError, "Either the 'prefix' or the 'site_packages' setting must be specified."
1.18 + if not self.prefix:
1.19 + raise TypeError, "The 'prefix' setting must be specified."
1.20
1.21 self.prefix_site_packages = self.site_packages or \
1.22 join(self.prefix, "lib", "python%s.%s" % sys.version_info[:2], "site-packages")
1.23 @@ -871,7 +871,11 @@
1.24 status("Installing MoinMoin in %s..." % self.prefix)
1.25
1.26 install_cmd = "install"
1.27 - options = "--prefix='%s' --record='%s'" % (self.prefix, log_filename)
1.28 + options = "--install-lib='%s' --install-data='%s' --install-scripts='%s' --record='%s'" % (
1.29 + self.prefix_site_packages,
1.30 + self.prefix,
1.31 + join(self.prefix, "bin"),
1.32 + log_filename)
1.33
1.34 os.system("%s setup.py --quiet %s %s --force" % (sys.executable, install_cmd, options))
1.35