From 2bee52debc0e96d7c09a429fc3c888bfaa32673a Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 5 Dec 2009 14:13:43 +0100 Subject: [PATCH] Do not rely on Perl symlink status, for MSYS perl. * automake.in (require_file_internal): Ensure presence of symlink target file; MSYS perl symlink doesn't return an error status when the file could not be created (copied, on this system). Fixes symlink.test failure. Signed-off-by: Ralf Wildenhues --- ChangeLog | 8 ++++++++ automake.in | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c970922..4963129 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-12-05 Ralf Wildenhues + + Do not rely on Perl symlink status, for MSYS perl. + * automake.in (require_file_internal): Ensure presence of + symlink target file; MSYS perl symlink doesn't return an error + status when the file could not be created (copied, on this + system). Fixes symlink.test failure. + 2009-12-04 Stefano Lattarini Ralf Wildenhues diff --git a/automake.in b/automake.in index e7f2cac..871c98e 100755 --- a/automake.in +++ b/automake.in @@ -7838,7 +7838,8 @@ sub require_file_internal ($$$@) unlink ($fullfile) if -f $fullfile; if ($symlink_exists && ! $copy_missing) { - if (! symlink ("$libdir/$file", $fullfile)) + if (! symlink ("$libdir/$file", $fullfile) + || ! -e $fullfile) { $suppress = 0; $trailer = "; error while making link: $!"; -- 2.7.4