forked from pool/automake
488b7b2e08
* Documentation fixes: - The documentation no longer mistakenly reports that the obsolete 'AM_MKDIR_PROG_P' macro and '$(mkdir_p)' make variable are going to be removed in Automake 2.0. * Bugs fixed: - Byte-compilation of Emacs lisp files could fail spuriously on Solaris, when /bin/ksh or /usr/xpg4/bin/sh were used as shell. - If the same user-defined suffixes were transformed into different Automake-known suffixes in different Makefile.am files in the same project, automake could get confused and generate inconsistent Makefiles (automake bug#14441). For example, if 'Makefile.am' contained a ".ext.cc:" suffix rule, and 'sub/Makefile.am' contained a ".ext.c:" suffix rule, automake would have mistakenly placed into 'Makefile.in' rules to compile "*.c" files into object files, and into 'sub/Makefile.in' rules to compile "*.cc" files into object files --- rather than the other way around. This is now fixed. - Several spurious failures have been fixed (they hit especially MinGW/MSYS builds). See automake bugs #14493, #14494, #14495, #14498, #14499, #14500, #14501, #14517 and #14528. - Some other minor miscellaneous changes and fixlets. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=34
25 lines
721 B
Diff
25 lines
721 B
Diff
---
|
|
automake.in | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
Index: automake.in
|
|
===================================================================
|
|
--- automake.in.orig 2013-06-03 16:18:00.000000000 +0200
|
|
+++ automake.in 2013-06-12 15:04:11.772901297 +0200
|
|
@@ -7489,12 +7489,14 @@ sub required_file_check_or_copy ($$$)
|
|
my $fullfile = "$dir/$file";
|
|
my $found_it = 0;
|
|
my $dangling_sym = 0;
|
|
+ my $thisdir = dirname ($fullfile);
|
|
+ my $thisfile = basename ($fullfile);
|
|
|
|
if (-l $fullfile && ! -f $fullfile)
|
|
{
|
|
$dangling_sym = 1;
|
|
}
|
|
- elsif (dir_has_case_matching_file ($dir, $file))
|
|
+ elsif (dir_has_case_matching_file ($thisdir, $thisfile))
|
|
{
|
|
$found_it = 1;
|
|
}
|