From 071efb9fcabfd65a9333c9a0a3170ba6e5f418cf Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Mon, 26 Apr 2010 17:46:25 +0400
Subject: [PATCH] Fix installation path

---
 pym/cl_fill_install.py | 2 +-
 scripts/cl-install     | 4 ++--
 setup.py               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index c7183a9..87b81eb 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -22,7 +22,7 @@ class fillVars(object, glob_attr):
     def get_cl_profile_path(self):
         """list appied templates"""
         profpath = []
-        profPaths=['/usr/lib/calculate/calculate-install/templates',
+        profPaths=['/usr/lib/calculate-2.2/calculate-install/templates',
                      '/var/calculate/remote/templates',
                      '/var/calculate/templates']
         for profPath in profPaths:
diff --git a/scripts/cl-install b/scripts/cl-install
index 347bf5a..1637263 100644
--- a/scripts/cl-install
+++ b/scripts/cl-install
@@ -17,8 +17,8 @@
 
 import sys
 import os
-sys.path.insert(0,os.path.abspath('/usr/lib/calculate/calculate-lib/pym'))
-sys.path.insert(0,os.path.abspath('/usr/lib/calculate/calculate-install/pym'))
+sys.path.insert(0,os.path.abspath('/usr/lib/calculate-2.2/calculate-lib/pym'))
+sys.path.insert(0,os.path.abspath('/usr/lib/calculate-2.2/calculate-install/pym'))
 
 from install_opt import install_opt
 
diff --git a/setup.py b/setup.py
index 54ed81f..b6e71d2 100755
--- a/setup.py
+++ b/setup.py
@@ -26,9 +26,9 @@ data_files = []
 var_data_files = []
 
 data_dirs_local = ['templates']
-share_calculate_dir = "/usr/share/calculate/"
+share_calculate_dir = "/usr/share/calculate-2.2/"
 data_dirs_share = ['i18n']
-#data_files += [('/etc/init.d', ['data/calculate2'])]
+#data_files += [('/etc/init.d', ['data/calculate-2.2'])]
 
 
 def __scanDir(scanDir, prefix, dirData, flagDir=False):
@@ -64,7 +64,7 @@ data_files += create_data_files (data_dirs_share, share_calculate_dir)
 class cl_install_data(install_data):
     def run (self):
         install_data.run(self)
-        #data_file = [("/etc/init.d/calculate2",0755)]
+        #data_file = [("/etc/init.d/calculate-2.2",0755)]
         data_file = []
         fileNames = map(lambda x: os.path.split(x[0])[1], data_file)
         listNames = map(lambda x: filter(lambda y: y, x[0].split("/")),data_file)