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/data.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/data.pm')
| -rw-r--r-- | perl-install/printer/data.pm | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm index 5718d6c9b..0d650ac02 100644 --- a/perl-install/printer/data.pm +++ b/perl-install/printer/data.pm @@ -6,7 +6,7 @@ use vars qw(@ISA @EXPORT); @ISA = qw(Exporter); @EXPORT = qw(%spoolers %spooler_inv %shortspooler_inv - $kernelversion $usbprintermodule + $kernelversion $usbprintermodule $lib $commonpackages $gimpprintingpackages $gnomecupspackages $localqueuepackages); @@ -18,13 +18,16 @@ chomp $kernelversion; our $usbprintermodule = ($kernelversion eq '2.6' ? "usblp" : "printer"); +# Architecture-specific data +our $lib = arch() =~ /x86_64/ ? "lib64" : "lib"; + # Packages which are always needed to run printerdrake our $commonpackages = [ [ 'foomatic-db-engine' ], [ '/usr/bin/foomatic-configure' ] ]; # Packages which are needed to print with the GIMP our $gimpprintingpackages = [ [ 'gutenprint-gimp2' ], - [ '/usr/lib/gimp/2.0/plug-ins/print' ] ]; + [ "/usr/$lib/gimp/2.0/plug-ins/print" ] ]; # Packages which are needed for CUPS under GNOME our $gnomecupspackages = [ [ 'desktop-printing' ], @@ -85,7 +88,7 @@ our %spoolers = ('pdq' => { /sbin/ifconfig /usr/bin/a2ps /usr/bin/convert)] ], - 'packages2rm' => [ 'LPRng', '/usr/lib/filters/lpf' ], + 'packages2rm' => [ 'LPRng', "/usr/$lib/filters/lpf" ], 'alternatives' => [ [ 'lpr', '/usr/bin/lpr-lpd' ], [ 'lpq', '/usr/bin/lpq-lpd' ], @@ -102,11 +105,11 @@ our %spoolers = ('pdq' => { 'service' => 'lpd', 'local_queues' => 1, 'packages2add' => [ [qw(LPRng net-tools a2ps ImageMagick)], - [qw(/usr/lib/filters/lpf - /usr/sbin/lpd - /sbin/ifconfig - /usr/bin/a2ps - /usr/bin/convert)] ], + ["/usr/$lib/filters/lpf", + "/usr/sbin/lpd", + "/sbin/ifconfig", + "/usr/bin/a2ps", + "/usr/bin/convert"] ], 'packages2rm' => [ 'lpr', '/usr/sbin/lpf' ], 'alternatives' => [ [ 'lpr', '/usr/bin/lpr-lpd' ], @@ -129,11 +132,11 @@ our %spoolers = ('pdq' => { 'local_queues' => 1, 'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gutenprint-cups', $::isInstall ? 'curl' : 'webfetch'], - [ qw(/usr/lib/cups/cgi-bin/printers.cgi - /sbin/ifconfig - /usr/bin/xpp - /usr/lib/cups/filter/rastertolxx74 - /usr/lib/cups/filter/commandtoepson), + [ "/usr/$lib/cups/cgi-bin/printers.cgi", + "/sbin/ifconfig", + "/usr/bin/xpp", + "/usr/$lib/cups/filter/rastertolxx74", + "/usr/$lib/cups/filter/commandtoepson", $::isInstall || !(-x '/usr/bin/wget') ? '/usr/bin/curl' : |