no_comment

1 files changed, 7 insertions, 9 deletions

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 0d425d209..7adb6c7e2 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -390,15 +390,13 @@ Consoles 1,3,4,7 may also contain interesting information";
 
     my $hasttf;
     my $dest = "$o->{prefix}/usr/X11R6/lib/X11/fonts/drakfont";
-    foreach (map { $_->{mntpoint} } grep { isFat($_) } @{$o->{fstab}}) {
-	foreach my $d (grep { m|/win|i } glob_("$o->{prefix}$_/*")) {
-	    $d .= "/fonts";
-	    -d "$o->{prefix}$d" or next;
-	    unless ($hasttf) {
-		mkdir $dest, 0755;
-		$hasttf = 1;
-	    }
-	    /(.*)\.ttf/i and symlink "$d/$_", "$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$d");
+    foreach my $d (map { $_->{mntpoint} } grep { isFat($_) } @{$o->{fstab}}) {
+	foreach my $D (map { "$d/$_" } grep { m|^win|i } all("$o->{prefix}$d")) {
+	    $D .= "/fonts";
+	    -d "$o->{prefix}$D" or next;
+	    log::l("found win font dir $D");
+	    $hasttf ||= mkdir $dest, 0755;
+	    /(.*)\.ttf/i and symlink "$D/$_", "$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$D");
 	}
     }
     run_program::rooted($o->{prefix}, "ttmkfdir", "-d", $dest, "-o", "$dest/fonts.dir") if $hasttf;