diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index b9941c2e93..7441126514 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -82,6 +82,7 @@ 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 if getattr(sys, "real_prefix", None): + # in a virtualenv DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/') else: DIST_MODULE_PATH = '/usr/share/ansible/' diff --git a/setup.py b/setup.py index f1d23d41eb..4ae1e661d4 100644 --- a/setup.py +++ b/setup.py @@ -9,11 +9,11 @@ from ansible import __version__, __author__ from distutils.core import setup # find library modules -from ansible.constants import DIST_MODULE_PATH +from ansible.constants import DEFAULT_MODULE_PATH dirs=os.listdir("./library/") data_files = [] for i in dirs: - data_files.append((DIST_MODULE_PATH + i, glob('./library/' + i + '/*'))) + data_files.append((DEFAULT_MODULE_PATH + i, glob('./library/' + i + '/*'))) setup(name='ansible', version=__version__,