1.1 --- a/README.txt Wed Oct 30 15:33:44 2013 +0100
1.2 +++ b/README.txt Sat Nov 09 22:27:18 2013 +0100
1.3 @@ -307,6 +307,13 @@
1.4 CMDsyntax Tested with 0.91
1.5 Source: http://www.boddie.org.uk/david/Projects/Python/CMDSyntax/index.html
1.6
1.7 +New in moinsetup 0.4.1 (Changes since moinsetup 0.4)
1.8 +----------------------------------------------------
1.9 +
1.10 + * Fixed the install_moin method to use the calculated site-packages
1.11 + directory for the MoinMoin libraries, since the setup.py file provided
1.12 + with MoinMoin does not always seem to respect the prefix.
1.13 +
1.14 New in moinsetup 0.4 (Changes since moinsetup 0.3)
1.15 --------------------------------------------------
1.16
2.1 --- a/moinsetup.py Wed Oct 30 15:33:44 2013 +0100
2.2 +++ b/moinsetup.py Sat Nov 09 22:27:18 2013 +0100
2.3 @@ -31,7 +31,7 @@
2.4 import sys
2.5 import tempfile
2.6
2.7 -__version__ = "0.4"
2.8 +__version__ = "0.4.1"
2.9
2.10 # Regular expressions for editing MoinMoin scripts and configuration files.
2.11
2.12 @@ -522,8 +522,8 @@
2.13
2.14 # Define the place where the MoinMoin package will actually reside.
2.15
2.16 - if not self.prefix and not self.site_packages:
2.17 - raise TypeError, "Either the 'prefix' or the 'site_packages' setting must be specified."
2.18 + if not self.prefix:
2.19 + raise TypeError, "The 'prefix' setting must be specified."
2.20
2.21 self.prefix_site_packages = self.site_packages or \
2.22 join(self.prefix, "lib", "python%s.%s" % sys.version_info[:2], "site-packages")
2.23 @@ -871,7 +871,11 @@
2.24 status("Installing MoinMoin in %s..." % self.prefix)
2.25
2.26 install_cmd = "install"
2.27 - options = "--prefix='%s' --record='%s'" % (self.prefix, log_filename)
2.28 + options = "--install-lib='%s' --install-data='%s' --install-scripts='%s' --record='%s'" % (
2.29 + self.prefix_site_packages,
2.30 + self.prefix,
2.31 + join(self.prefix, "bin"),
2.32 + log_filename)
2.33
2.34 os.system("%s setup.py --quiet %s %s --force" % (sys.executable, install_cmd, options))
2.35