Fix source distribution

Add missing files to MANIFEST.in
Better package structure
Better path handling

1 files changed, 4 insertions, 8 deletions

diff --git a/setup.py b/setup.py
index 0ece14ff..db571527 100755
--- a/setup.py
+++ b/setup.py
@@ -8,13 +8,9 @@ from setuptools import setup
 
 data_files = [
     ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst',
-                           'docs/glances-doc.html',
-                           'glances/conf/glances.conf']),
+                           'conf/glances.conf', 'docs/glances-doc.html']),
     ('share/doc/glances/images', glob.glob('docs/images/*.png')),
-    ('share/glances/css', glob.glob('glances/data/css/*.css')),
-    ('share/glances/html', glob.glob('glances/data/html/*.html')),
-    ('share/glances/img', glob.glob('glances/data/img/*.png')),
-    ('share/man/man1', ['docs/man/glances.1'])
+    ('share/man/man1', ['man/glances.1'])
 ]
 
 if hasattr(sys, 'real_prefix') or 'bsd' in sys.platform:
@@ -25,7 +21,7 @@ elif 'darwin' in sys.platform:
     conf_path = os.path.join('/usr/local', 'etc', 'glances')
 elif 'win32' in sys.platform:
     conf_path = os.path.join(os.environ.get('APPDATA'), 'glances')
-data_files.append((conf_path, ['glances/conf/glances.conf']))
+data_files.append((conf_path, ['conf/glances.conf']))
 
 for mo in glob.glob('i18n/*/LC_MESSAGES/*.mo'):
     data_files.append((os.path.dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
@@ -43,7 +39,7 @@ setup(
     author='Nicolas Hennion',
     author_email='nicolas@nicolargo.com',
     url='https://github.com/nicolargo/glances',
-    # Alternative download_url='https://s3.amazonaws.com/glances/glances-1.7.1.tar.gz',
+    # download_url='https://s3.amazonaws.com/glances/glances-1.7.1.tar.gz',
     license="LGPL",
     keywords="cli curses monitoring system",
     install_requires=requires,