mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
32 lines
1,002 B
Diff
32 lines
1,002 B
Diff
|
=== modified file 'intltool-update.in'
|
||
|
|
--- intltool-update.in 2014-05-14 02:15:53 +0000
|
||
|
|
+++ intltool-update.in 2015-02-03 15:05:59 +0000
|
||
|
|
@@ -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
|
||
|
|
|