diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index eb474090ef6..7441126514a 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -86,8 +86,6 @@ if getattr(sys, "real_prefix", None): DIST_MODULE_PATH = os.path.join(sys.prefix, 'share/ansible/') else: DIST_MODULE_PATH = '/usr/share/ansible/' -# custom ansible location without a virtualenv -DIST_MODULE_PATH = os.environ.get("ANSIBLE_DIST_MODULE_PATH", DIST_MODULE_PATH) # sections in config file DEFAULTS='defaults' diff --git a/setup.py b/setup.py index f1d23d41eb4..4ae1e661d4c 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__,