commit: dc5c38c92d70b45f50e342d3276f4f68ba4ca114
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 01:04:55 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 01:04:55 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dc5c38c9
setup.py: Fix rebase errors causing the lib/catalyst files to not be installed
setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index 5913bae..1d421bc 100755
--- a/setup.py
+++ b/setup.py
@@ -48,8 +48,8 @@ _data_files = [('/etc/catalyst',
['etc/catalyst.conf','etc/catalystrc']),
('/usr/share/man/man1', ['files/catalyst.1']),
('/usr/share/man/man5', ['files/catalyst-config.5',
'files/catalyst-spec.5'])
]
-_data_files.extend(_files('livecd', 'lib/catalyst/'))
-_data_files.extend(_files('targets', 'lib/catalyst/'))
+_data_files.extend(_files('lib/catalyst/livecd', 'livecd'))
+_data_files.extend(_files('lib/catalyst/targets', 'targets'))
class set_version(_Command):
