summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-04 18:28:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-04 18:28:29 +0000
commitaffeb728eb84141dabb2f4bb3e727d7c8e2c05fc (patch)
tree3a224a33933aa68ae1d1d026a7585b89818cac91
parent1ac565261e2b8039735dad609a00fc4a0ed03b35 (diff)
downloaddrakx-backup-do-not-use-affeb728eb84141dabb2f4bb3e727d7c8e2c05fc.tar
drakx-backup-do-not-use-affeb728eb84141dabb2f4bb3e727d7c8e2c05fc.tar.gz
drakx-backup-do-not-use-affeb728eb84141dabb2f4bb3e727d7c8e2c05fc.tar.bz2
drakx-backup-do-not-use-affeb728eb84141dabb2f4bb3e727d7c8e2c05fc.tar.xz
drakx-backup-do-not-use-affeb728eb84141dabb2f4bb3e727d7c8e2c05fc.zip
$prefix is no good, replace it with $::prefix
-rwxr-xr-xperl-install/scanner.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index f9f743b57..2be0dcf0b 100755
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -30,13 +30,13 @@ use detect_devices;
use log;
-my $_sanedir = "$prefix/etc/sane.d";
-my $_scannerDBdir = "$prefix$ENV{SHARE_PATH}/ldetect-lst";
+my $_sanedir = "$::prefix/etc/sane.d";
+my $_scannerDBdir = "$::prefix$ENV{SHARE_PATH}/ldetect-lst";
my $scannerDB = readScannerDB("$_scannerDBdir/ScannerDB");
sub confScanner {
my ($model, $port) = @_;
- $port ||= detect_devices::dev_is_devfs() ? "$prefix/dev/usb/scanner0" : "$prefix/dev/scanner";
+ $port ||= detect_devices::dev_is_devfs() ? "$::prefix/dev/usb/scanner0" : "$::prefix/dev/scanner";
my $a = $scannerDB->{$model}{server};
#print "file:[$a]\t[$model]\t[$port]\n| ", (join "\n| ", @{$scannerDB->{$model}{lines}}),"\n";
output("$_sanedir/$a.conf", (join "\n", @{$scannerDB->{$model}{lines}}));