intltool/repos/extra-any/intltool_distcheck-fix.patch

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