diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2005-09-06 17:10:16 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2005-09-06 17:10:16 +0000 |
| commit | 73fcd46f4d2e496a81bcd1d25dac4980bd6b5345 (patch) | |
| tree | fa449ce72fb7ca3702c5cb8aba8c088b93bd7086 /perl-install/printer/main.pm | |
| parent | 7362ad09f2308dd02c2f02d2a366971ed9e9d17b (diff) | |
| download | drakx-73fcd46f4d2e496a81bcd1d25dac4980bd6b5345.tar drakx-73fcd46f4d2e496a81bcd1d25dac4980bd6b5345.tar.gz drakx-73fcd46f4d2e496a81bcd1d25dac4980bd6b5345.tar.bz2 drakx-73fcd46f4d2e496a81bcd1d25dac4980bd6b5345.tar.xz drakx-73fcd46f4d2e496a81bcd1d25dac4980bd6b5345.zip | |
- Made printerdrake working on 64-bit systems, with /usr/lib64.
Diffstat (limited to 'perl-install/printer/main.pm')
| -rw-r--r-- | perl-install/printer/main.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm index 302281d21..0e45f79e9 100644 --- a/perl-install/printer/main.pm +++ b/perl-install/printer/main.pm @@ -65,7 +65,7 @@ sub spooler() { return map { $spoolers{$_}{long_name} } ('cups', 'rcups' , if_(files_exist(qw(/usr/bin/pdq)), 'pdq'), - if_(files_exist(qw(/usr/lib/filters/lpf /usr/sbin/lpd)), 'lprng')); + if_(files_exist("/usr/$lib/filters/lpf", "/usr/sbin/lpd"), 'lprng')); } sub printer_type($) { @@ -2785,8 +2785,8 @@ sub start_hplip { foreach my $a (@autodetected) { $device eq $a->{port} or next; open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . - '/bin/sh -c "export LC_ALL=C; /usr/lib/cups/backend/hp" |') or - die 'Could not run "/usr/lib/cups/backend/hp"!'; + "/bin/sh -c \"export LC_ALL=C; /usr/$lib/cups/backend/hp\" |") or + die "Could not run \"/usr/$lib/cups/backend/hp\"!"; while (my $line = <$F>) { if (($line =~ m!^direct\s+(hp:/$bus/(\S+?)\?serial=(\S+))\s+!) || ($line =~ m!^direct\s+(hp:/$bus/(\S+?)\?device=()(\S+))\s+!) || @@ -2820,8 +2820,8 @@ sub start_hplip_manual { # Return all possible device URIs open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . - '/bin/sh -c "export LC_ALL=C; /usr/lib/cups/backend/hp" |') or - die 'Could not run "/usr/lib/cups/backend/hp"!'; + "/bin/sh -c \"export LC_ALL=C; /usr/$lib/cups/backend/hp\" |") or + die "Could not run \"/usr/$lib/cups/backend/hp\"!"; my @uris; while (<$F>) { m!^direct\s+(hp:\S+)\s+!; |