aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-08-29 18:04:55 -0700
committerBrian Dolbec <dolsen@gentoo.org>2015-08-29 18:04:55 -0700
commitdc5c38c92d70b45f50e342d3276f4f68ba4ca114 (patch)
tree882b74bb29c1f3ea6fa0eb122a7ce0531fc32343
parentversion.py: Fix missed edits (diff)
downloadcatalyst-dc5c38c9.tar.gz
catalyst-dc5c38c9.tar.bz2
catalyst-dc5c38c9.zip
setup.py: Fix rebase errors causing the lib/catalyst files to not be installed
-rwxr-xr-xsetup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 5913bae4..1d421bcb 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):