|
Lines 534-540
Link Here
|
| 534 |
self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) |
534 |
self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) |
| 535 |
|
535 |
|
| 536 |
install = self.get_finalized_command('install') |
536 |
install = self.get_finalized_command('install') |
| 537 |
self.install_prefix = "/opt/trinity/" |
537 |
self.install_prefix = ask_kde_config('--prefix').strip() |
| 538 |
|
538 |
|
| 539 |
# KDE inc dir: find it! |
539 |
# KDE inc dir: find it! |
| 540 |
if self.kde_inc_dir is None: |
540 |
if self.kde_inc_dir is None: |
|
Lines 553-567
Link Here
|
| 553 |
self.announce("Using %s for KDE header files" % self.kde_inc_dir) |
553 |
self.announce("Using %s for KDE header files" % self.kde_inc_dir) |
| 554 |
|
554 |
|
| 555 |
# KDE lib dir |
555 |
# KDE lib dir |
| 556 |
#if self.kde_lib_dir is None: |
556 |
if self.kde_lib_dir is None: |
| 557 |
# self.kde_lib_dir = os.path.join(install.prefix,"lib") |
557 |
self.kde_lib_dir = os.path.join(self.install_prefix,"lib") |
| 558 |
self.kde_lib_dir = "/opt/trinity/lib/" |
|
|
| 559 |
self.announce("Using %s for KDE library files" % self.kde_lib_dir) |
558 |
self.announce("Using %s for KDE library files" % self.kde_lib_dir) |
| 560 |
|
559 |
|
| 561 |
# KDE KCM lib dir |
560 |
# KDE KCM lib dir |
| 562 |
#if self.kde_kcm_lib_dir is None: |
561 |
if self.kde_kcm_lib_dir is None: |
| 563 |
# self.kde_kcm_lib_dir = os.path.join(self.kde_lib_dir,"trinity") |
562 |
self.kde_kcm_lib_dir = os.path.join(self.kde_lib_dir,"trinity") |
| 564 |
self.kde_kcm_lib_dir = "/opt/trinity/lib/trinity/" |
|
|
| 565 |
if FindFileInPaths('*kcm*.so',[self.kde_kcm_lib_dir]) is None: |
563 |
if FindFileInPaths('*kcm*.so',[self.kde_kcm_lib_dir]) is None: |
| 566 |
raise SystemExit, "Failed to find KDE KCM files in: %s" % self.kde_kcm_lib_dir |
564 |
raise SystemExit, "Failed to find KDE KCM files in: %s" % self.kde_kcm_lib_dir |
| 567 |
self.announce("Using %s for KDE KCM library files" % self.kde_kcm_lib_dir) |
565 |
self.announce("Using %s for KDE KCM library files" % self.kde_kcm_lib_dir) |
|
Lines 1487-1493
Link Here
|
| 1487 |
self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) |
1485 |
self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) |
| 1488 |
|
1486 |
|
| 1489 |
install = self.get_finalized_command('install') |
1487 |
install = self.get_finalized_command('install') |
| 1490 |
self.install_prefix = "/opt/trinity/" |
1488 |
self.install_prefix = ask_kde_config('--prefix').strip() |
| 1491 |
|
1489 |
|
| 1492 |
# KDE inc dir: find it! |
1490 |
# KDE inc dir: find it! |
| 1493 |
if self.kde_inc_dir is None: |
1491 |
if self.kde_inc_dir is None: |
|
Lines 1506-1520
Link Here
|
| 1506 |
self.announce("Using %s for KDE header files" % self.kde_inc_dir) |
1504 |
self.announce("Using %s for KDE header files" % self.kde_inc_dir) |
| 1507 |
|
1505 |
|
| 1508 |
# KDE lib dir |
1506 |
# KDE lib dir |
| 1509 |
#if self.kde_lib_dir is None: |
1507 |
if self.kde_lib_dir is None: |
| 1510 |
# self.kde_lib_dir = os.path.join(install.prefix,"lib") |
1508 |
self.kde_lib_dir = os.path.join(self.install_prefix,"lib") |
| 1511 |
self.kde_lib_dir = "/opt/trinity/lib/" |
|
|
| 1512 |
self.announce("Using %s for KDE library files" % self.kde_lib_dir) |
1509 |
self.announce("Using %s for KDE library files" % self.kde_lib_dir) |
| 1513 |
|
1510 |
|
| 1514 |
# KDE tdeioslave lib dir |
1511 |
# KDE tdeioslave lib dir |
| 1515 |
#if self.kde_tdeioslave_lib_dir is None: |
1512 |
if self.kde_tdeioslave_lib_dir is None: |
| 1516 |
# self.kde_tdeioslave_lib_dir = os.path.join(self.kde_lib_dir,"trinity") |
1513 |
self.kde_tdeioslave_lib_dir = os.path.join(self.kde_lib_dir,"trinity") |
| 1517 |
self.kde_tdeioslave_lib_dir = "/opt/trinity/lib/trinity/" |
|
|
| 1518 |
if FindFileInPaths('tdeio_*.so',[self.kde_tdeioslave_lib_dir]) is None: |
1514 |
if FindFileInPaths('tdeio_*.so',[self.kde_tdeioslave_lib_dir]) is None: |
| 1519 |
raise SystemExit, "Failed to find KDE Tdeioslave library files in: %s" % self.kde_tdeioslave_lib_dir |
1515 |
raise SystemExit, "Failed to find KDE Tdeioslave library files in: %s" % self.kde_tdeioslave_lib_dir |
| 1520 |
self.announce("Using %s for KDE Tdeioslave library files" % self.kde_tdeioslave_lib_dir) |
1516 |
self.announce("Using %s for KDE Tdeioslave library files" % self.kde_tdeioslave_lib_dir) |