diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-01-18 16:52:17 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-01-18 16:52:17 +0100 |
| commit | 6d061b325b08a6e7638911054c85b8bf1f95ec88 (patch) | |
| tree | 4f00fe406e158f95fdb3b683d594c7ecad28577c | |
| parent | f664d2c45fbb060dfbf2fcd7f2f0cabbf7427954 (diff) | |
| download | pytdeextensions-6d061b325b08a6e7638911054c85b8bf1f95ec88.tar.gz pytdeextensions-6d061b325b08a6e7638911054c85b8bf1f95ec88.zip | |
Remove hardcoded 'lib' directory
| -rw-r--r-- | src/kdedistutils.py | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/kdedistutils.py b/src/kdedistutils.py index 7e77d09..4aa6383 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -542,7 +542,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/trinity/" + self.install_prefix = ask_kde_config('--prefix').strip() # KDE inc dir: find it! if self.kde_inc_dir is None: @@ -561,15 +561,13 @@ class BuildKControlModule(Command): self.announce("Using %s for KDE header files" % self.kde_inc_dir) # 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/trinity/lib/" + if self.kde_lib_dir is None: + self.kde_lib_dir = os.path.join(self.install_prefix,"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,"trinity") - self.kde_kcm_lib_dir = "/opt/trinity/lib/trinity/" + if self.kde_kcm_lib_dir is None: + self.kde_kcm_lib_dir = os.path.join(self.kde_lib_dir,"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) @@ -1496,7 +1494,7 @@ class BuildTdeioslave(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/trinity/" + self.install_prefix = ask_kde_config('--prefix').strip() # KDE inc dir: find it! if self.kde_inc_dir is None: @@ -1515,15 +1513,13 @@ class BuildTdeioslave(Command): self.announce("Using %s for KDE header files" % self.kde_inc_dir) # 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/trinity/lib/" + if self.kde_lib_dir is None: + self.kde_lib_dir = os.path.join(self.install_prefix,"lib") self.announce("Using %s for KDE library files" % self.kde_lib_dir) # KDE tdeioslave lib dir - #if self.kde_tdeioslave_lib_dir is None: - # self.kde_tdeioslave_lib_dir = os.path.join(self.kde_lib_dir,"trinity") - self.kde_tdeioslave_lib_dir = "/opt/trinity/lib/trinity/" + if self.kde_tdeioslave_lib_dir is None: + self.kde_tdeioslave_lib_dir = os.path.join(self.kde_lib_dir,"trinity") if FindFileInPaths('tdeio_*.so',[self.kde_tdeioslave_lib_dir]) is None: raise SystemExit, "Failed to find KDE Tdeioslave library files in: %s" % self.kde_tdeioslave_lib_dir self.announce("Using %s for KDE Tdeioslave library files" % self.kde_tdeioslave_lib_dir) |