mirror of
git://slackware.nl/current.git
synced 2024-11-16 07:48:02 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
31 lines
1,002 B
Diff
31 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
|
|
|