summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-08-01 18:42:49 +0000
committerThierry Vignaud <tv@mageia.org>2011-08-01 18:42:49 +0000
commit312728c5b23daaad5a6040131a20df7ae5758158 (patch)
tree684d8252f49088ee3cf641fce1a155ccac1846dc /perl-install
parent42d7daded67296d1400cf39801d69fcc6628e8f0 (diff)
downloaddrakx-backup-do-not-use-312728c5b23daaad5a6040131a20df7ae5758158.tar
drakx-backup-do-not-use-312728c5b23daaad5a6040131a20df7ae5758158.tar.gz
drakx-backup-do-not-use-312728c5b23daaad5a6040131a20df7ae5758158.tar.bz2
drakx-backup-do-not-use-312728c5b23daaad5a6040131a20df7ae5758158.tar.xz
drakx-backup-do-not-use-312728c5b23daaad5a6040131a20df7ae5758158.zip
enable support for LibreOffice/gs/... only if available(#461)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakfont6
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 63d59a986..082f3173b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- drakfont:
o rename Ooo as LibreOffice (#461)
+ o enable support for LibreOffice/gs/... only if available(#461)
- fix bootloader entries names
Version 13.60 - 27 July 2011
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index e2b0eaf83..fb802fa63 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -100,9 +100,9 @@ $ugtk2::wm_icon = "drakfont";
my $xlsfonts = 0;
my $windows = 0;
my $replace;
-my $so = 1;
-my $gs = 1;
-my $abi = 1;
+my $so = -f '/usr/bin/ooffice';
+my $gs = -f '/usr/bin/gs';
+my $abi = -f '/usr/bin/abiword';
my $printer = 1;
my $mode = -1;
my @application;