diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-02-12 13:22:52 -0800 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-02-12 13:46:48 -0800 |
| commit | 8e83609f2033aad3e2fd631328d804956803906c (patch) | |
| tree | 142be50eddfc67899e3b960cbfc4b6218cc0b4cd | |
| parent | pkgcore: add -q/--quiet options to help output (diff) | |
| download | pkgcore-8e83609f2033aad3e2fd631328d804956803906c.tar.gz pkgcore-8e83609f2033aad3e2fd631328d804956803906c.tar.bz2 pkgcore-8e83609f2033aad3e2fd631328d804956803906c.zip | |
setup: use relative path for data files to respect sys.prefix
| -rw-r--r-- | pkgcore/ebuild/portage_conf.py | 4 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgcore/ebuild/portage_conf.py b/pkgcore/ebuild/portage_conf.py index 71c860c56..0b91b48c5 100644 --- a/pkgcore/ebuild/portage_conf.py +++ b/pkgcore/ebuild/portage_conf.py @@ -13,6 +13,7 @@ __all__ = ( ) import os +import sys from snakeoil.compatibility import raise_from, IGNORED_EXCEPTIONS from snakeoil.demandload import demandload @@ -394,7 +395,8 @@ def config_from_make_conf(location="/etc/", profile_override=None, **kwargs): raise try: config_path = os.environ.get( - 'PKGCORE_CONFIG_PATH', pjoin(config_root, 'usr/share/pkgcore/config')) + 'PKGCORE_CONFIG_PATH', + pjoin(config_root, sys.prefix.lstrip('/'), 'share/pkgcore/config')) load_make_config(conf_dict, pjoin(config_path, 'make.globals')) except IGNORED_EXCEPTIONS: raise @@ -467,7 +467,7 @@ core.setup( _get_files('pkgcore/ebuild/eapi-bash')], }, data_files=[ - ('/usr/share/pkgcore/config', glob.glob('config/*')), + ('share/pkgcore/config', glob.glob('config/*')), ], ext_modules=extensions, cmdclass=cmdclass, command_options=command_options, ) |