aboutsummaryrefslogtreecommitdiffstats
path: root/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-12-17 02:47:13 +0000
committerLuka Perkov <luka@openwrt.org>2013-12-17 02:47:13 +0000
commit7e8930847e9d83d69b3fea1b837d7128485bfd32 (patch)
tree8594df066b0928b6207142d5d3cddbb8506f63b6 /tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
parent993a9de79a0c3f82940190bf9b49c77abce47118 (diff)
downloadmaster-187ad058-7e8930847e9d83d69b3fea1b837d7128485bfd32.tar.gz
master-187ad058-7e8930847e9d83d69b3fea1b837d7128485bfd32.tar.bz2
master-187ad058-7e8930847e9d83d69b3fea1b837d7128485bfd32.zip
[tools] automake: update to 1.11.6
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39108 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/automake/patches/100-aclocal-skip-not-existing-directories.patch')
-rw-r--r--tools/automake/patches/100-aclocal-skip-not-existing-directories.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
index 7829d0ecde..e6c3d7f335 100644
--- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
+++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -1,6 +1,6 @@
--- a/aclocal.in
+++ b/aclocal.in
-@@ -314,6 +314,12 @@ sub scan_m4_dirs ($@)
+@@ -327,6 +327,12 @@
foreach my $m4dir (@dirlist)
{
@@ -12,4 +12,4 @@
+
if (! opendir (DIR, $m4dir))
{
- fatal "couldn't open directory `$m4dir': $!";
+ if ($install && $type == FT_USER && $first_user_m4dir)