From: Tom Tromey <tromey@redhat.com>
Date: Thu, 7 Jan 1999 11:19:06 +0000 (+0000)
Subject: 1999-01-06  Gary V. Vaughan  <garyv@oranda.demon.co.uk>
X-Git-Tag: Release-1-4~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3789977fbab9b2c03938396c0470d111a2067e4;p=thirdparty%2Fautomake.git

1999-01-06  Gary V. Vaughan  <garyv@oranda.demon.co.uk>
	* automake.in (require_file_internal): qub perl on win32 hangs
	on a call to unlink for a non-existant file, which in turn causes
	tests/symlink.test to hang on win32.  Check that the file exists
	before unlinking it!
---

diff --git a/ChangeLog b/ChangeLog
index efc8f953a..d0a0a4f67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-01-06  Gary V. Vaughan  <garyv@oranda.demon.co.uk>
+
+	* automake.in (require_file_internal): qub perl on win32 hangs
+	on a call to unlink for a non-existant file, which in turn causes
+	tests/symlink.test to hang on win32.  Check that the file exists
+	before unlinking it!
+
 1998-12-24  Thomas Tanner  <tanner@gmx.de>
 
 	* automake.in (handle_ltlibraries): check whether -module was
diff --git a/automake.in b/automake.in
index d4dc354ed..d50e1bc66 100755
--- a/automake.in
+++ b/automake.in
@@ -6782,7 +6782,9 @@ sub require_file_internal
 			# can, copy if we must.  Note: delete the file
 			# first, in case it is a dangling symlink.
 			$message = "installing \`$errfile'";
-			unlink ($errfile);
+			# Windows Perl will hang if we try to delete a
+			# file that doesn't exist.
+			unlink ($errfile) if -f $errfile;
 			if ($symlink_exists && ! $copy_missing)
 			{
 			    if (! symlink ($am_dir . '/' . $file, $errfile))