Merge branch 'devel' of git://github.com/skorokithakis/ansible into devel

lib/ansible/constants.py

@@ -17,6 +17,7 @@
 
 import os
 import pwd
+import sys
 import ConfigParser
 
 def get_config(p, section, key, env_var, default):
@@ -60,7 +61,10 @@ active_user   = pwd.getpwuid(os.geteuid())[0]
 
 # Needed so the RPM can call setup.py and have modules land in the
 # correct location. See #1277 for discussion
-DIST_MODULE_PATH = '/usr/share/ansible/'
+if getattr(sys, "real_prefix", None):
+    DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/')
+else:
+    DIST_MODULE_PATH = '/usr/share/ansible/'
 
 # sections in config file
 DEFAULTS='defaults'