From 173f6469a1465fe1adb00e2ac64c099795ec9762 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Sat, 17 Aug 2002 01:13:07 +0000
Subject: Fixes to make it possible toinstall HP's multi-function devices
 during installation.

---
 perl-install/printer.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'perl-install/printer.pm')

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.
-- 
cgit v1.2.1