summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2002-08-17 01:13:07 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2002-08-17 01:13:07 +0000
commit173f6469a1465fe1adb00e2ac64c099795ec9762 (patch)
tree3e961dcb6998fa969572f2a966dba38259ea863c /perl-install
parentc37ddfcbdd4e7d5c482074e240ced136ff699999 (diff)
downloaddrakx-173f6469a1465fe1adb00e2ac64c099795ec9762.tar
drakx-173f6469a1465fe1adb00e2ac64c099795ec9762.tar.gz
drakx-173f6469a1465fe1adb00e2ac64c099795ec9762.tar.bz2
drakx-173f6469a1465fe1adb00e2ac64c099795ec9762.tar.xz
drakx-173f6469a1465fe1adb00e2ac64c099795ec9762.zip
Fixes to make it possible toinstall HP's multi-function devices during installation.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/printer.pm11
1 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 9d1a82e11..012e443cd 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -1449,10 +1449,19 @@ sub configure_hpoj {
if (m!sub main!) {
last;
} elsif (m!^[^\#]!) {
+ # Make the subroutines also working during installation
+ if ($::isInstall) {
+ s!\$prefix!\$hpoj_prefix!g;
+ s!prefix=\"/usr\"!prefix=\"$prefix/usr\"!g;
+ s!etcPtal=\"/etc/ptal\"!etcPtal=\"$prefix/etc/ptal\"!g;
+ s!varLock=\"/var/lock\"!varLock=\"$prefix/var/lock\"!g;
+ s!varRunPrefix=\"/var/run\"!varRunPrefix=\"$prefix/var/run\"!g;
+ }
push (@ptalinitfunctions, $_);
}
}
close PTALINIT;
+
eval "@ptalinitfunctions
sub getDevnames {
return (%devnames)
@@ -1610,7 +1619,7 @@ sub configure_hpoj {
# Open configuration file
local *CONFIG;
- open(CONFIG,"> /etc/ptal/$ptaldevice") ||
+ open(CONFIG,"> $prefix/etc/ptal/$ptaldevice") ||
die "Could not open /etc/ptal/$ptaldevice for writing!\n";
# Write file header.