diff --git a/setup.cfg b/setup.cfg index 264486a..a584652 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,4 +2,4 @@ install-scripts=/usr/bin install-purelib=/usr/lib/calculate-2.2 install-platlib=/usr/lib/calculate-2.2 -install-data=/usr/share/calculate/templates +#install-data=/usr/share/calculate/templates diff --git a/setup.py b/setup.py index 1899196..f6758aa 100755 --- a/setup.py +++ b/setup.py @@ -32,11 +32,11 @@ data_files = [] var_data_files = [] -data_dirs_template = ['templates'] +#data_dirs_template = ['templates'] data_dirs_share = ['i18n'] share_calculate_dir = "/usr/share/calculate" -template_calculate_dir = os.path.join(share_calculate_dir, "templates") -template_replace_dirname = "desktop" +#template_calculate_dir = os.path.join(share_calculate_dir, "templates") +#template_replace_dirname = "desktop" def __scanDir(scanDir, prefix, replace_dirname, dirData, flagDir=False): """Scan directory""" @@ -70,8 +70,8 @@ def create_data_files(data_dirs, prefix="", replace_dirname=""): return data_files -data_files += create_data_files(data_dirs_template, template_calculate_dir, - template_replace_dirname) +#data_files += create_data_files(data_dirs_template, template_calculate_dir, +# template_replace_dirname) data_files += create_data_files(data_dirs_share, share_calculate_dir) data_files += [('/usr/share/calculate/xdm', ['data/cmd_login', 'data/functions', @@ -82,8 +82,8 @@ data_files += [('/usr/share/calculate/xdm', ['data/cmd_login', 'data/login.d/20desktop', 'data/login.d/99final'])] +\ [('/usr/share/calculate/xdm/logout.d', - ['data/logout.d/00init'])] +\ - [('/var/calculate/templates', [])] + ['data/logout.d/00init'])] +# [('/var/calculate/templates', [])] class cl_install_data(install_data):