From: Kornel Benko <kornel@lyx.org>
Date: Mon, 18 Nov 2013 15:12:50 +0000 (+0100)
Subject: Merge branch 'master' of git.lyx.org:lyx
X-Git-Tag: 2.1.0rc1~404
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=19758b248772465db1693cd2537c7737f31d057d;hp=be28081c35890682ebbf63a7f84ff80a79f4a768;p=features.git

Merge branch 'master' of git.lyx.org:lyx
---

diff --git a/development/autotests/useSystemFonts.pl b/development/autotests/useSystemFonts.pl
index c26f758e1e..c5a59c70d5 100644
--- a/development/autotests/useSystemFonts.pl
+++ b/development/autotests/useSystemFonts.pl
@@ -43,7 +43,6 @@ BEGIN {
 }
 use File::Basename;
 use File::Path;
-use Cwd 'abs_path';
 use File::Copy "cp";
 use File::Temp qw/ :POSIX /;
 use lyxStatus;
@@ -57,8 +56,8 @@ my ($source, $dest, $format, $rest) = @ARGV;
 &diestack("Destfilename not defined") if (! defined($dest));
 &diestack("Format (e.g. pdf4) not defined") if (! defined($format));
 
-$source = &abs_path($source);
-$dest = &abs_path($dest);
+$source = File::Spec->rel2abs($source);
+$dest = File::Spec->rel2abs($dest);
 
 my %font = ();