From cc134c0d627b3bcf3d60867aa4012a643b756679 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 4 Oct 2007 15:11:19 +0000
Subject: - fix configuring kdeglobals (was broken because of /etc/kderc using 
  udpate-alternatives which use absolute symlinks)

---
 perl-install/lang.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'perl-install/lang.pm')

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index e33d9ac95..fbe28b1f4 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1134,8 +1134,12 @@ sub write {
        	          ));
 
     eval {
-	my %dir_defaults = read_gnomekderc("$::prefix/etc/kderc", 'Directories-default');
-	my $confdir = $::prefix . ($b_user_only ? "$ENV{HOME}/.kde" : first(split(',', $dir_defaults{prefixes})) || "/etc/kde") . '/share/config';
+	my $confdir = $::prefix . ($b_user_only ? "$ENV{HOME}/.kde" : do {
+	    my $kderc = $::prefix ? common::expand_symlinks_with_absolute_symlinks_in_prefix($::prefix, '/etc/kderc') : '/etc/kderc';
+	    log::l("reading $kderc");
+	    my %dir_defaults = read_gnomekderc($kderc, 'Directories-default');
+	    first(split(',', $dir_defaults{prefixes})) || "/etc/kde"
+	}) . '/share/config';
 
 	-d $confdir or die 'not configuring kde config files since it is not installed/used';
 
-- 
cgit v1.2.1