From eb34885fd41fb9cf43d843e2dc7837dcf55d9075 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/pykdeextensions@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kdedistutils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/kdedistutils.py b/src/kdedistutils.py index 0deb5cf..dd45d17 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -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) -- cgit v1.2.1