From 472946154ca0383e30977ef815f4ff3608f9d165 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Thu, 30 Jan 2014 17:56:39 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.cfg | 2 -- setup.py | 15 ++++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index b15c456..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[install_data] -install_dir=/ diff --git a/setup.py b/setup.py index 353bf1b..1209a33 100755 --- a/setup.py +++ b/setup.py @@ -23,12 +23,12 @@ __version__ = "3.2.0_alpha1" from distutils.core import setup, Extension from calculate.install_data import install_data -data_files = [('etc/init.d', [('data/client',0755)]), - ('usr/share/calculate/xdm/login.d', +data_files = [('/etc/init.d', [('data/client',0755)]), + ('/usr/share/calculate/xdm/login.d', ['data/login.d/10client']), - ('usr/share/calculate/xdm/logout.d', + ('/usr/share/calculate/xdm/logout.d', ['data/logout.d/10client']), - ('usr/share/calculate/xdm/',[('data/wait_domain',0755)])] + ('/usr/share/calculate/xdm/',[('data/wait_domain',0755)])] setup( name = __app__, @@ -39,10 +39,7 @@ setup( url = "http://calculate-linux.org", license = "http://www.apache.org/licenses/LICENSE-2.0", package_dir = {'calculate.client': "client"}, - packages = ['calculate.client','calculate.client.variables'], + packages = ['calculate.client','calculate.client.utils', + 'calculate.client.variables'], data_files = data_files, - ext_modules = [Extension('calculate.client._cl_keys', - library_dirs = ['/usr/lib'], - libraries = ['keyutils'], - sources = ['./lib/cl_keys.i', './lib/cl_keys.c'])], cmdclass={'install_data': install_data})