diff options
| -rw-r--r-- | src/kdedistutils.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/kdedistutils.py b/src/kdedistutils.py index b6e2458..3d3f728 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -529,7 +529,7 @@ class BuildKControlModule(Command): self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) install = self.get_finalized_command('install') - self.install_prefix = "/opt/kde3/" + self.install_prefix = "/opt/trinity/" # KDE inc dir: find it! if self.kde_inc_dir is None: @@ -538,7 +538,7 @@ class BuildKControlModule(Command): if kdedir!=None: canidatepaths.append(os.path.join(kdedir,"include")) canidatepaths.append(os.path.join(install.prefix,"include")) - canidatepaths.append('/opt/kde3/include') + canidatepaths.append('/opt/trinity/include') canidatepaths.append('/opt/kde/include') self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths) if self.kde_inc_dir is None: @@ -550,13 +550,13 @@ class BuildKControlModule(Command): # KDE lib dir #if self.kde_lib_dir is None: # self.kde_lib_dir = os.path.join(install.prefix,"lib") - self.kde_lib_dir = "/opt/kde3/lib/" + self.kde_lib_dir = "/opt/trinity/lib/" self.announce("Using %s for KDE library files" % self.kde_lib_dir) # KDE KCM lib dir #if self.kde_kcm_lib_dir is None: # self.kde_kcm_lib_dir = os.path.join(self.kde_lib_dir,"kde3") - self.kde_kcm_lib_dir = "/opt/kde3/lib/kde3/" + self.kde_kcm_lib_dir = "/opt/trinity/lib/kde3/" if FindFileInPaths('*kcm*.so',[self.kde_kcm_lib_dir]) is None: raise SystemExit, "Failed to find KDE KCM files in: %s" % self.kde_kcm_lib_dir self.announce("Using %s for KDE KCM library files" % self.kde_kcm_lib_dir) @@ -812,7 +812,7 @@ class BuildKControlModule(Command): # # PyKDE libs # linklist.append("-L"+self.pykde_dir); linklist.append("-lkdecorecmodule"); linklist.append("-lkdeuicmodule") - linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/kde3/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize") + linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize") linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt") linklist.append("-lm") linklist.append("-lstdc++") @@ -851,9 +851,9 @@ class BuildKControlModule(Command): #include <sip.h> #define MODULE_DIR "%(moduledir)s" -#define EXTRA_MODULE_DIR "/opt/kde3/share/python-support/kde-guidance-kde3" -#define EXTRA_MODULE_DIR_TWO "/opt/kde3/share/python-support/guidance-backends-kde3" -#define EXTRA_MODULE_DIR_THREE "/opt/kde3/share/python-support/kde-guidance-powermanager-kde3" +#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/kde-guidance-trinity" +#define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity" +#define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/kde-guidance-powermanager-trinity" #define MODULE_NAME "%(modulename)s" #define FACTORY "%(factoryfunction)s" #define CPP_FACTORY %(factoryfunction)s @@ -1272,7 +1272,7 @@ class UpdateI18NMessages(Command): canidatepaths.append(os.path.join(kdedir,"include")) install = self.get_finalized_command('install') canidatepaths.append(os.path.join(install.kde_prefix,"include")) - canidatepaths.append('/opt/kde3/include') + canidatepaths.append('/opt/trinity/include') canidatepaths.append('/opt/kde/include') kde_pot_dir = FindFileInPaths('kde.pot',canidatepaths) @@ -1456,7 +1456,7 @@ class BuildKioslave(Command): self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) install = self.get_finalized_command('install') - self.install_prefix = "/opt/kde3/" + self.install_prefix = "/opt/trinity/" # KDE inc dir: find it! if self.kde_inc_dir is None: @@ -1465,7 +1465,7 @@ class BuildKioslave(Command): if kdedir!=None: canidatepaths.append(os.path.join(kdedir,"include")) canidatepaths.append(os.path.join(install.prefix,"include")) - canidatepaths.append('/opt/kde3/include') + canidatepaths.append('/opt/trinity/include') canidatepaths.append('/opt/kde/include') self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths) if self.kde_inc_dir is None: @@ -1477,13 +1477,13 @@ class BuildKioslave(Command): # KDE lib dir #if self.kde_lib_dir is None: # self.kde_lib_dir = os.path.join(install.prefix,"lib") - self.kde_lib_dir = "/opt/kde3/lib/" + self.kde_lib_dir = "/opt/trinity/lib/" self.announce("Using %s for KDE library files" % self.kde_lib_dir) # KDE kioslave lib dir #if self.kde_kioslave_lib_dir is None: # self.kde_kioslave_lib_dir = os.path.join(self.kde_lib_dir,"kde3") - self.kde_kioslave_lib_dir = "/opt/kde3/lib/kde3/" + self.kde_kioslave_lib_dir = "/opt/trinity/lib/kde3/" if FindFileInPaths('kio_*.so',[self.kde_kioslave_lib_dir]) is None: raise SystemExit, "Failed to find KDE Kioslave library files in: %s" % self.kde_kioslave_lib_dir self.announce("Using %s for KDE Kioslave library files" % self.kde_kioslave_lib_dir) @@ -1722,7 +1722,7 @@ class BuildKioslave(Command): # # PyKDE libs # linklist.append("-L"+self.pykde_dir); linklist.append("-lkdecorecmodule"); linklist.append("-lkdeuicmodule") - linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/kde3/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize") + linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize") linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt") linklist.append("-lm") linklist.append("-lstdc++") @@ -2071,7 +2071,7 @@ def FindExeOnPath(exe_name,high_prio_dirs=None,low_prio_dirs=None): def ask_kde_config(question): # Look for the kde-config program kdeconfig = find_executable("kde-config", os.environ['PATH'] + os.pathsep + \ - os.pathsep.join(['/bin','/usr/bin','/opt/kde3/bin','/opt/kde/bin','/usr/local/bin'])) + os.pathsep.join(['/bin','/usr/bin','/opt/trinity/bin','/opt/kde/bin','/usr/local/bin'])) if kdeconfig!=None: # Ask the kde-config program for the fhandle = os.popen(kdeconfig+' ' + question,'r') |