From 52d403f2a7cf7ac491f5d6c2587fc594f4c1ec32 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 30 Aug 2011 18:29:28 +0200 Subject: The setup script should work now o/ --- mat-cli | 2 +- mat-gui | 2 +- setup.py | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mat-cli b/mat-cli index 6b2de43..8e38d97 100755 --- a/mat-cli +++ b/mat-cli @@ -116,7 +116,7 @@ def list_supported(): handler = mat.XMLParser() parser = xml.sax.make_parser() parser.setContentHandler(handler) - with open('FORMATS', 'r') as xmlfile: + with open(mat.get_sharedir() + 'FORMATS', 'r') as xmlfile: parser.parse(xmlfile) for item in handler.list: diff --git a/mat-gui b/mat-gui index d92df74..a11bdff 100755 --- a/mat-gui +++ b/mat-gui @@ -355,7 +355,7 @@ data loss, but clean more efficiently')) handler = mat.XMLParser() parser = xml.sax.make_parser() parser.setContentHandler(handler) - with open('FORMATS', 'r') as xmlfile: + with open(mat.get_sharedir() + 'FORMATS', 'r') as xmlfile: parser.parse(xmlfile) for item in handler.list: # list of dict : one dict per format diff --git a/setup.py b/setup.py index 2a1d230..2332505 100755 --- a/setup.py +++ b/setup.py @@ -9,10 +9,12 @@ setup(name='MAT', author_email='julien.voisin@dustri.org', license='GPLv2', url='https://gitweb.torproject.org/user/jvoisin/mat.git', - packages=['mat', 'mat.hachoir_editor', 'mat.pdfrw', 'mat.bencode', 'mat.tarfile'], + packages=['mat', 'mat.hachoir_editor', 'mat.pdfrw', 'mat.bencode', + 'mat.tarfile'], scripts=['mat-cli', 'mat-gui'], data_files=[ - ( '/usr/share/applications/', [ 'mat.desktop' ] ), - ( '', ['FORMATS'] ), + ( 'share/applications', [ 'mat.desktop' ] ), + ( 'share/mat', ['FORMATS'] ), + ( 'share/doc/mat', ['README', 'TODO'] ), ] ) -- cgit v1.3