Skip to content

Commit be84b39

Browse files
committed
setup.py: use portage EPREFIX if available
Only fixes installation paths; still needs work to run on prefix. Bug: https://bugs.gentoo.org/654128 Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
1 parent 8febe62 commit be84b39

1 file changed

Lines changed: 17 additions & 5 deletions

File tree

setup.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
_package_name = 'catalyst'
2020
_maintainer_name, _maintainer_email = _parseaddr(__maintainer__)
2121

22+
# establish the eprefix, initially set so eprefixify can
23+
# set it on install
24+
EPREFIX = "@GENTOO_PORTAGE_EPREFIX@"
25+
# check and set it if it wasn't
26+
if "GENTOO_PORTAGE_EPREFIX" in EPREFIX:
27+
EPREFIX = ''
2228

2329
def _posix_path(path):
2430
"""Convert a native path to a POSIX path
@@ -48,12 +54,18 @@ def _files(prefix, root):
4854
yield (install_directory, file_source_paths)
4955

5056

51-
_data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']),
52-
('/usr/share/man/man1', ['files/catalyst.1']),
53-
('/usr/share/man/man5', ['files/catalyst-config.5', 'files/catalyst-spec.5'])
57+
_data_files = [
58+
(_os.path.join(_os.sep, EPREFIX.lstrip(_os.sep), 'etc/catalyst'),
59+
['etc/catalyst.conf','etc/catalystrc']),
60+
(_os.path.join(_os.sep, EPREFIX.lstrip(_os.sep), 'usr/share/man/man1'),
61+
['files/catalyst.1']),
62+
(_os.path.join(_os.sep, EPREFIX.lstrip(_os.sep), 'usr/share/man/man5'),
63+
['files/catalyst-config.5', 'files/catalyst-spec.5'])
5464
]
55-
_data_files.extend(_files('share/catalyst/livecd', 'livecd'))
56-
_data_files.extend(_files('share/catalyst/targets', 'targets'))
65+
_data_files.extend(_files(_os.path.join(_os.sep, EPREFIX.lstrip(_os.sep),
66+
'usr/share/catalyst/livecd'), 'livecd'))
67+
_data_files.extend(_files(_os.path.join(_os.sep, EPREFIX.lstrip(_os.sep),
68+
'usr/share/catalyst/targets'), 'targets'))
5769

5870

5971
class set_version(_Command):

0 commit comments

Comments
 (0)