# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1384032438 -3600
# Node ID 83951d19c80fb2d112bdad8b68eaac4db7ed7799
# Parent  dc7f2e6f5d9d3cab3f20c9a11534bbec212340a7
Work around an apparent prefix-related problem with Moin's setup.py.

diff -r dc7f2e6f5d9d -r 83951d19c80f README.txt
--- a/README.txt	Wed Oct 30 15:33:44 2013 +0100
+++ b/README.txt	Sat Nov 09 22:27:18 2013 +0100
@@ -307,6 +307,13 @@
 CMDsyntax                   Tested with 0.91
                             Source: http://www.boddie.org.uk/david/Projects/Python/CMDSyntax/index.html
 
+New in moinsetup 0.4.1 (Changes since moinsetup 0.4)
+----------------------------------------------------
+
+  * Fixed the install_moin method to use the calculated site-packages
+    directory for the MoinMoin libraries, since the setup.py file provided
+    with MoinMoin does not always seem to respect the prefix.
+
 New in moinsetup 0.4 (Changes since moinsetup 0.3)
 --------------------------------------------------
 
diff -r dc7f2e6f5d9d -r 83951d19c80f moinsetup.py
--- a/moinsetup.py	Wed Oct 30 15:33:44 2013 +0100
+++ b/moinsetup.py	Sat Nov 09 22:27:18 2013 +0100
@@ -31,7 +31,7 @@
 import sys
 import tempfile
 
-__version__ = "0.4"
+__version__ = "0.4.1"
 
 # Regular expressions for editing MoinMoin scripts and configuration files.
 
@@ -522,8 +522,8 @@
 
         # Define the place where the MoinMoin package will actually reside.
 
-        if not self.prefix and not self.site_packages:
-            raise TypeError, "Either the 'prefix' or the 'site_packages' setting must be specified."
+        if not self.prefix:
+            raise TypeError, "The 'prefix' setting must be specified."
 
         self.prefix_site_packages = self.site_packages or \
             join(self.prefix, "lib", "python%s.%s" % sys.version_info[:2], "site-packages")
@@ -871,7 +871,11 @@
         status("Installing MoinMoin in %s..." % self.prefix)
 
         install_cmd = "install"
-        options = "--prefix='%s' --record='%s'" % (self.prefix, log_filename)
+        options = "--install-lib='%s' --install-data='%s' --install-scripts='%s' --record='%s'" % (
+            self.prefix_site_packages,
+            self.prefix,
+            join(self.prefix, "bin"),
+            log_filename)
 
         os.system("%s setup.py --quiet %s %s --force" % (sys.executable, install_cmd, options))