intltool_distcheck-fix.patch 1.1 KB

12345678910111213141516171819202122232425262728293031
  1. diff -upr intltool-0.51.0-orig/intltool-update.in intltool-0.51.0/intltool-update.in
  2. --- intltool-0.51.0-orig/intltool-update.in 2016-07-29 14:08:06.276987000 +0200
  3. +++ intltool-0.51.0/intltool-update.in 2016-07-29 14:11:09.562126918 +0200
  4. @@ -620,6 +620,14 @@ sub FindLeftoutFiles
  5. my @result;
  6. + # If the builddir is a subdir of srcdir, the list of files found will be prefixed with
  7. + # an additional prefix (e.g. "_build/sub" for automake 1.15 make distcheck). Try to
  8. + # handle that, by removing those matches as well.
  9. + my $absbuilddir = Cwd::abs_path("..\/");
  10. + my $abssrcdir = Cwd::abs_path("$SRCDIR/..");
  11. + # Check if builddir is a subdir of srcdir
  12. + my ($abspath,$relpath) = split /\s*$abssrcdir\/\s*/, $absbuilddir, 2;
  13. +
  14. foreach (@buf_allfiles_sorted)
  15. {
  16. my $dummy = $_;
  17. @@ -628,7 +636,10 @@ sub FindLeftoutFiles
  18. $srcdir =~ s#^../##;
  19. $dummy =~ s#^$srcdir/../##;
  20. $dummy =~ s#^$srcdir/##;
  21. - $dummy =~ s#_build/##;
  22. + if ($relpath)
  23. + {
  24. + $dummy =~ s#^$relpath/##;
  25. + }
  26. if (!exists($in2{$dummy}))
  27. {
  28. push @result, $dummy