forked from pool/intltool
Dominique Leuenberger
c7db056ac1
OBS-URL: https://build.opensuse.org/request/show/607002 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=41
30 lines
1019 B
Diff
30 lines
1019 B
Diff
--- intltool-0.51.0-orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100
|
|
+++ intltool-0.51.0/intltool-update.in 2018-05-13 21:44:00.561217678 +0200
|
|
@@ -620,6 +620,14 @@
|
|
|
|
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 @@
|
|
$srcdir =~ s#^../##;
|
|
$dummy =~ s#^$srcdir/../##;
|
|
$dummy =~ s#^$srcdir/##;
|
|
- $dummy =~ s#_build/##;
|
|
+ if ($relpath)
|
|
+ {
|
|
+ $dummy =~ s#^$relpath/##;
|
|
+ }
|
|
if (!exists($in2{$dummy}))
|
|
{
|
|
push @result, $dummy
|