|
|
|
@ -206,39 +206,39 @@ class InstallKDE(install):
|
|
|
|
|
if self.kde_prefix is not None:
|
|
|
|
|
self.install_scripts = os.path.join(self.kde_prefix,'bin')
|
|
|
|
|
else:
|
|
|
|
|
self.announce("Detecting KDE 'bin' directory...")
|
|
|
|
|
self.announce("Detecting TDE 'bin' directory...")
|
|
|
|
|
self.install_scripts = ask_kde_config('--install exe --expandvars').strip()
|
|
|
|
|
self.announce(" ...KDE 'bin' directory is %s" % self.install_scripts)
|
|
|
|
|
self.announce(" ...TDE 'bin' directory is %s" % self.install_scripts)
|
|
|
|
|
|
|
|
|
|
if self.install_application_data is None:
|
|
|
|
|
if self.kde_prefix is not None:
|
|
|
|
|
self.install_application_data = os.path.join(self.kde_prefix,'share/apps',self.distribution.metadata.name)
|
|
|
|
|
else:
|
|
|
|
|
self.announce("Detecting KDE application directory...")
|
|
|
|
|
self.announce("Detecting TDE application directory...")
|
|
|
|
|
kdeappdir = ask_kde_config('--install data --expandvars').strip()
|
|
|
|
|
self.announce(" ...KDE application directory is %s" % self.install_application_data)
|
|
|
|
|
self.announce(" ...TDE application directory is %s" % self.install_application_data)
|
|
|
|
|
self.install_application_data = os.path.join(kdeappdir,self.distribution.metadata.name)
|
|
|
|
|
|
|
|
|
|
if self.install_messages is None:
|
|
|
|
|
if self.kde_prefix is not None:
|
|
|
|
|
self.install_messages = os.path.join(self.kde_prefix,'share/locale')
|
|
|
|
|
else:
|
|
|
|
|
self.announce("Detecting KDE messages directory...")
|
|
|
|
|
self.announce("Detecting TDE messages directory...")
|
|
|
|
|
self.install_messages = ask_kde_config('--install locale --expandvars').strip()
|
|
|
|
|
self.announce(" ...KDE messages directory is %s" % self.install_messages)
|
|
|
|
|
self.announce(" ...TDE messages directory is %s" % self.install_messages)
|
|
|
|
|
|
|
|
|
|
if self.install_html is None:
|
|
|
|
|
if self.kde_prefix is not None:
|
|
|
|
|
self.install_html = os.path.join(self.kde_prefix,'share/doc/HTML')
|
|
|
|
|
self.install_html = os.path.join(self.kde_prefix,'share/doc/tde/HTML')
|
|
|
|
|
else:
|
|
|
|
|
self.announce("Detecting KDE HTML directory...")
|
|
|
|
|
self.announce("Detecting TDE HTML directory...")
|
|
|
|
|
self.install_html = ask_kde_config('--install html --expandvars').strip()
|
|
|
|
|
self.announce(" ...KDE HTML directory is %s" % self.install_html)
|
|
|
|
|
self.announce(" ...TDE HTML directory is %s" % self.install_html)
|
|
|
|
|
|
|
|
|
|
if self.kde_prefix is None:
|
|
|
|
|
self.announce("Detecting KDE install prefix...")
|
|
|
|
|
self.announce("Detecting TDE install prefix...")
|
|
|
|
|
self.kde_prefix = ask_kde_config('--prefix').strip()
|
|
|
|
|
self.announce(" ...KDE install prefix is %s" % self.kde_prefix)
|
|
|
|
|
self.announce(" ...TDE install prefix is %s" % self.kde_prefix)
|
|
|
|
|
self.user_supplied_kde_prefix = False
|
|
|
|
|
|
|
|
|
|
if self.install_cmd is None:
|
|
|
|
|