From faeb5d40107bd52bba49b52e359e567502d58c18 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Mon, 25 Feb 2002 11:22:58 +0000
Subject: Improvved mechanism which searches for Star/Open Office Added path to
 Star/Open Office printing commands

---
 perl-install/printer.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 65dce935c..3ab281cc4 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -1781,7 +1781,7 @@ sub makestarofficeprinterentry {
     # Make an entry in the "[ports]" section
     $configfile = removeentry("ports", "$queue=", $configfile);
     $configfile = addentry("ports", 
-			   "$queue=lpr -P $queue",
+			   "$queue=/usr/bin/lpr -P $queue",
 			   $configfile);
     # Make printer's section
     $configfile = addsection("$queue,PostScript,$queue", $configfile);
@@ -1846,7 +1846,7 @@ sub makeopenofficeprinterentry {
     # "Command" line
     $configfile = removeentry($queue, "Command=", $configfile);
     $configfile = addentry($queue, 
-			   "Command=lpr -P $queue",
+			   "Command=/usr/bin/lpr -P $queue",
 			   $configfile);
     # "Comment" line 
     $configfile = removeentry($queue, "Comment=", $configfile);
@@ -1927,7 +1927,11 @@ sub findsofficeconfigfile {
     my @configfilenames = ("/usr/lib/*/share/xp3/Xpdefaults",
 			   "/usr/local/lib/*/share/xp3/Xpdefaults",
 			   "/usr/local/*/share/xp3/Xpdefaults",
-			   "/opt/*/share/xp3/Xpdefaults");
+			   "/opt/*/share/xp3/Xpdefaults",
+			   "/*/share/xp3/Xpdefaults",
+			   "/*/*/share/xp3/Xpdefaults",
+			   "/*/*/*/share/xp3/Xpdefaults",
+			   "/*/*/*/*/share/xp3/Xpdefaults");
     my $configfilename = "";
     for $configfilename (@configfilenames) {
 	local *F;
@@ -1945,7 +1949,11 @@ sub findopenofficeconfigfile {
 	("/usr/lib/*/share/psprint/psprint.conf",
 	 "/usr/local/lib/*/share/psprint/psprint.conf",
 	 "/usr/local/*/share/psprint/psprint.conf",
-	 "/opt/*/share/psprint/psprint.conf");
+	 "/opt/*/share/psprint/psprint.conf",
+	 "/*/share/psprint/psprint.conf",
+	 "/*/*/share/psprint/psprint.conf",
+	 "/*/*/*/share/psprint/psprint.conf",
+	 "/*/*/*/*/share/psprint/psprint.conf");
     my $configfilename = "";
     for $configfilename (@configfilenames) {
 	local *F;
-- 
cgit v1.2.1