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/printerdrake.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/printerdrake.pm')
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 8c9d73353..a3fbb7310 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -2537,10 +2537,10 @@ sub setup_common { if ($hplipentry->{scan}) { # Install SANE if (!$::testing && - (!files_exist(qw(/usr/bin/scanimage - /usr/bin/xscanimage - /etc/sane.d/dll.conf - /usr/lib/libsane-hpaio.so.1)) || + (!files_exist("/usr/bin/scanimage", + "/usr/bin/xscanimage", + "/etc/sane.d/dll.conf", + "/usr/$lib/libsane-hpaio.so.1") || (!files_exist(qw(/usr/bin/xsane)) && !files_exist(qw(/usr/bin/kooka)) && ($::isInstall || @@ -2650,10 +2650,10 @@ sub setup_common { $makemodel !~ /HP\s+(DeskJet|dj)\s*450/i) { # Install SANE if (!$::testing && - (!files_exist(qw(/usr/bin/scanimage - /usr/bin/xscanimage - /etc/sane.d/dll.conf - /usr/lib/libsane-hpoj.so.1)) || + (!files_exist("/usr/bin/scanimage", + "/usr/bin/xscanimage", + "/etc/sane.d/dll.conf", + "/usr/$lib/libsane-hpoj.so.1") || (!files_exist(qw(/usr/bin/xsane)) && !files_exist(qw(/usr/bin/kooka)) && ($::isInstall || @@ -5130,8 +5130,8 @@ sub mainwindow_interactive { val => N("CUPS configuration") } : ()), ($printer->{expert} && (files_exist(qw(/usr/bin/pdq)) || - files_exist(qw(/usr/lib/filters/lpf - /usr/sbin/lpd))) ? + files_exist("/usr/$lib/filters/lpf", + "/usr/sbin/lpd")) ? { clicked_may_quit => sub { # Save the cursor position |