diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-10-09 13:33:50 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-10-09 13:33:50 +0000 |
| commit | be4bed98cf355fd9842fc7cfc785c89352011bc1 (patch) | |
| tree | 2f10e4dc74a0220f1e013ac249a39b49cd8c3d84 | |
| parent | 3aee86ee93d01693e4b4d7564517cd35dc8558ef (diff) | |
| download | drakx-backup-do-not-use-be4bed98cf355fd9842fc7cfc785c89352011bc1.tar drakx-backup-do-not-use-be4bed98cf355fd9842fc7cfc785c89352011bc1.tar.gz drakx-backup-do-not-use-be4bed98cf355fd9842fc7cfc785c89352011bc1.tar.bz2 drakx-backup-do-not-use-be4bed98cf355fd9842fc7cfc785c89352011bc1.tar.xz drakx-backup-do-not-use-be4bed98cf355fd9842fc7cfc785c89352011bc1.zip | |
lib64 fixes
| -rw-r--r-- | perl-install/any.pm | 4 | ||||
| -rw-r--r-- | perl-install/printerdrake.pm | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index d1994d2c9..1909261e2 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -396,8 +396,8 @@ sub writeandclean_ldsoconf { my ($prefix) = @_; my $file = "$prefix/etc/ld.so.conf"; output $file, - grep { !m|^(/usr)?/lib$| } #- no need to have /lib and /usr/lib in ld.so.conf - uniq cat_($file), "/usr/X11R6/lib\n"; + grep { !m|^(/usr)?/lib(64)?$| } #- no need to have /lib and /usr/lib in ld.so.conf + uniq cat_($file), (if_(arch() =~ /x86_64/, "/usr/X11R6/lib64\n"), "/usr/X11R6/lib\n"); } sub shells { diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index d94d0886b..29bbfd1f5 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -13,6 +13,9 @@ use printer; 1; +#- Define library name where plugins and libraries are +my $lib = arch() =~ /x86_64/ ? "lib64" : "lib"; + sub choose_printer_type { my ($printer, $in) = @_; $in->set_help('configurePrinterConnected') if $::isInstall; @@ -1353,7 +1356,7 @@ sub setup_common { /usr/bin/xscanimage /usr/bin/xsane /etc/sane.d/dll.conf - /usr/lib/libsane-hpoj.so.1), + /usr/$lib/libsane-hpoj.so.1), (printer::files_exist ('/usr/bin/gimp') ? '/usr/bin/xsane-gimp' : @@ -2747,7 +2750,7 @@ sub install_spooler { my $w = $in->wait_message(_("Printerdrake"), _("Checking installed software...")); if ((!$::testing) && - (!printer::files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi + (!printer::files_exist((qw(/usr/$lib/cups/cgi-bin/printers.cgi /sbin/ifconfig /usr/bin/xpp), ($::expert ? @@ -2793,7 +2796,7 @@ sub install_spooler { _("Checking installed software...")); # "lpr" conflicts with "LPRng", remove "LPRng" if ((!$::testing) && - (printer::files_exist((qw(/usr/lib/filters/lpf))))) { + (printer::files_exist((qw(/usr/$lib/filters/lpf))))) { my $w = $in->wait_message(_("Printerdrake"), _("Removing LPRng...")); $in->do_pkgs->remove_nodeps('LPRng'); @@ -2838,7 +2841,7 @@ sub install_spooler { $in->do_pkgs->remove_nodeps('lpr'); } if ((!$::testing) && - (!printer::files_exist((qw(/usr/lib/filters/lpf + (!printer::files_exist((qw(/usr/$lib/filters/lpf /usr/sbin/lpd /sbin/ifconfig /usr/bin/gpr @@ -3002,7 +3005,7 @@ sub main { /usr/bin/scli ), (printer::files_exist("/usr/bin/gimp") ? - "/usr/lib/gimp/1.2/plug-ins/print" : ()) + "/usr/$lib/gimp/1.2/plug-ins/print" : ()) )))) { $in->do_pkgs->install('foomatic','printer-utils','printer-testpages','nmap','scli', if_($in->do_pkgs->is_installed('gimp'), 'gimpprint')); |