From eefc611960146fbd8ee00253ff9f8efa82917b09 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Nov 2020 08:55:58 +0100 Subject: data/: Don't mimick FHS in source tree. Use more commonly used data/ tree structure. --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0955d06..1021212 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ import os, polib, configparser m_lstDataFiles = [] -oFile = open('data/usr/share/applications/{}.desktop'.format(APPNAME), 'r+') +oFile = open('data/applications/{}.desktop'.format(APPNAME), 'r+') oConfigParser = configparser.ConfigParser() oConfigParser.optionxform = str oConfigParser.read_file(oFile) @@ -46,7 +46,7 @@ for strRoot, lstDirnames, lstFilenames in os.walk('po'): if strLocale != APPNAME: - strLocaleDir = 'data/usr/share/locale/' + strLocale + '/LC_MESSAGES/' + strLocaleDir = 'data/locale/' + strLocale + '/LC_MESSAGES/' if not os.path.isdir(strLocaleDir): @@ -63,7 +63,9 @@ for strRoot, lstDirnames, lstFilenames in os.walk('data'): continue strPath = os.path.join(strRoot, strFilename) - m_lstDataFiles.append((os.path.dirname(strPath).lstrip('data'), [strPath])) + m_lstDataFiles.append(("share/{data}".format(data=os.path.dirname(strPath).replace('data/', '')), [strPath])) + +m_lstDataFiles.append(('bin/', ['ayatana-settings'])) setup( name = APPNAME, -- cgit v1.2.3