summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/office.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/printer/office.pm')
-rw-r--r--perl-install/printer/office.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/printer/office.pm b/perl-install/printer/office.pm
index f4a01a224..fb905107d 100644
--- a/perl-install/printer/office.pm
+++ b/perl-install/printer/office.pm
@@ -11,6 +11,8 @@ use printer::cups;
# Star Office/OpenOffice.org
# ------------------------------------------------------------------
+# OpenOffice.org stuff applies only for Star Office 6.x now, as our
+# OpenOffice.org is patched for native CUPS support
our $suites = {
'OpenOffice.Org' => {
@@ -19,10 +21,10 @@ our $suites = {
'file_name' => '^(.*)/share/psprint/psprint.conf$',
'param' => ["Generic Printer", "Command="],
'perl' => "/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/",
- 'files' => ["/usr/lib/*/share/psprint/psprint.conf",
- "/usr/local/lib/*/share/psprint/psprint.conf",
- "/usr/local/*/share/psprint/psprint.conf",
- "/opt/*/share/psprint/psprint.conf"],
+ 'files' => ["/usr/lib/office6*/share/psprint/psprint.conf",
+ "/usr/local/lib/office6*/share/psprint/psprint.conf",
+ "/usr/local/office6*/share/psprint/psprint.conf",
+ "/opt/office6*/share/psprint/psprint.conf"],
},
'Star Office' => {
'make' => \&makestarofficeprinterentry,