File _service:tar_scm:intltool_distcheck-fix.patch of Package intltool

File _service:tar_scm:intltool_distcheck-fix.patch of Package intltool (Revision f1913829dadd34d3b3c723aa9a639368)

Currently displaying revision f1913829dadd34d3b3c723aa9a639368 , Show latest

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