|
|
|
@ -256,12 +256,12 @@ class InstallKDE(install):
|
|
|
|
|
|
|
|
|
|
if self.install_kcm is None:
|
|
|
|
|
self.announce("Detecting kcm library directory...")
|
|
|
|
|
self.install_kcm = os.path.join(ask_kde_config('--install lib --expandvars').strip(),'kde3')
|
|
|
|
|
self.install_kcm = os.path.join(ask_kde_config('--install lib --expandvars').strip(),'trinity')
|
|
|
|
|
self.announce(" ...kcm library directory is %s" % self.install_kcm)
|
|
|
|
|
|
|
|
|
|
if self.install_kioslave is None:
|
|
|
|
|
self.announce("Detecting kioslave library directory...")
|
|
|
|
|
self.install_kioslave = os.path.join(ask_kde_config('--install lib --expandvars').strip(),'kde3')
|
|
|
|
|
self.install_kioslave = os.path.join(ask_kde_config('--install lib --expandvars').strip(),'trinity')
|
|
|
|
|
self.announce(" ...kioslave library directory is %s" % self.install_kioslave)
|
|
|
|
|
|
|
|
|
|
if self.install_protocol is None:
|
|
|
|
@ -555,8 +555,8 @@ class BuildKControlModule(Command):
|
|
|
|
|
|
|
|
|
|
# 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/trinity/lib/kde3/"
|
|
|
|
|
# self.kde_kcm_lib_dir = os.path.join(self.kde_lib_dir,"trinity")
|
|
|
|
|
self.kde_kcm_lib_dir = "/opt/trinity/lib/trinity/"
|
|
|
|
|
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)
|
|
|
|
@ -1484,8 +1484,8 @@ class BuildKioslave(Command):
|
|
|
|
|
|
|
|
|
|
# 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/trinity/lib/kde3/"
|
|
|
|
|
# self.kde_kioslave_lib_dir = os.path.join(self.kde_lib_dir,"trinity")
|
|
|
|
|
self.kde_kioslave_lib_dir = "/opt/trinity/lib/trinity/"
|
|
|
|
|
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)
|
|
|
|
|