Fix setup.py

1 files changed, 23 insertions, 21 deletions

diff --git a/setup.py b/setup.py
index 2f696eed..f65ad885 100755
--- a/setup.py
+++ b/setup.py
@@ -12,10 +12,10 @@ data_files = [
                            'COPYING',
                            'AUTHORS',
                            'NEWS',
-                           'screenshot.png']),
+                           'screenshot.png',
+                           'glances/conf/glances.conf']),
     ('share/doc/glances/doc', glob('doc/*.png')),
-    ('/etc', ['glances/conf/glances.conf']),
-    ('share/glances/conf-default', ['glances/conf/glances.conf']),
+    ('etc/glances', ['glances/conf/glances.conf']),
     ('share/glances/html', glob('glances/html/*.html')),
     ('share/glances/css', glob('glances/css/*.css')),
     ('share/glances/img', glob('glances/img/*.png')),
@@ -24,22 +24,24 @@ data_files = [
 for mo in glob('i18n/*/LC_MESSAGES/*.mo'):
     data_files.append((dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
 
-setup(name='Glances',
-      version='1.6b',
-      download_url='https://s3.amazonaws.com/glances/glances-1.6b.tar.gz',
-      url='https://github.com/nicolargo/glances',
-      description='CLI curses-based monitoring tool',
-      author='Nicolas Hennion',
-      author_email='nicolas@nicolargo.com',
-      license="LGPL",
-      keywords="cli curses monitoring system",
-      long_description=open('README').read(),
-      install_requires=['psutil>=0.4.1'],
-      packages=['glances'],
-      extras_require = {
-          'HTML':  ['jinja2>=2.0'],
-          'SENSORS':  ['pysensors>=0.0.2'],},
-      include_package_data=True,
-      data_files=data_files,
-      entry_points={"console_scripts": ["glances = glances.glances:main"]},
+setup(
+    name='Glances',
+    version='1.6b',
+    download_url='https://s3.amazonaws.com/glances/glances-1.6b.tar.gz',
+    url='https://github.com/nicolargo/glances',
+    description='CLI curses-based monitoring tool',
+    author='Nicolas Hennion',
+    author_email='nicolas@nicolargo.com',
+    license="LGPL",
+    keywords="cli curses monitoring system",
+    long_description=open('README').read(),
+    install_requires=['psutil>=0.4.1'],
+    packages=['glances'],
+    extras_require={
+        'HTML': ['jinja2>=2.0'],
+        'SENSORS': ['pysensors>=0.0.2'],
+    },
+    include_package_data=True,
+    data_files=data_files,
+    entry_points={"console_scripts": ["glances=glances.glances:main"]},
 )