From bf1ce26a4860a3aabf8ba539475465c2dbcb19b3 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 5 Jan 2001 16:54:28 +0000
Subject: use of SHARE_PATH for MonitorsDB, Cards+, CardsNames

---
 perl-install/Xconfigurator.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 6bd55004b..786bc032d 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -73,12 +73,12 @@ sub readCardsDB {
     \%cards;
 }
 sub readCardsNames {
-    my $file = "/usr/share/ldetect-lst/CardsNames";
+    my $file = "$ENV{SHARE_PATH}/ldetect-lst/CardsNames";
     local *F; open F, $file or die "can't find $file\n";
     map { (split '=>')[0] } grep { !/^#/ } <F>;
 }
 sub cardName2RealName {
-    my $file = "/usr/share/ldetect-lst/CardsNames";
+    my $file = "$ENV{SHARE_PATH}/ldetect-lst/CardsNames";
     my ($name) = @_;
     local *F; open F, $file or die "can't find $file\n";
     local $_;
@@ -92,7 +92,7 @@ sub cardName2RealName {
 }
 sub updateCardAccordingName {
     my ($card, $name) = @_;
-    my $cards = readCardsDB("/usr/share/ldetect-lst/Cards+");
+    my $cards = readCardsDB("$ENV{SHARE_PATH}/ldetect-lst/Cards+");
 
     add2hash($card->{flags}, $cards->{$name}{flags});
     add2hash($card, $cards->{$name});
@@ -358,7 +358,7 @@ sub monitorConfiguration(;$$) {
 
     $monitor->{hsyncrange} && $monitor->{vsyncrange} and return $monitor;
 
-    readMonitorsDB("/usr/share/ldetect-lst/MonitorsDB");
+    readMonitorsDB("$ENV{SHARE_PATH}/ldetect-lst/MonitorsDB");
 
     add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Custom', keys %monitors], 'Generic|' . translate($default_monitor)) }) unless $monitor->{type};
     if ($monitor->{type} eq 'Custom') {
-- 
cgit v1.2.1