summaryrefslogtreecommitdiffstats
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
commit0b4e8c4c364368491714d80e465c71625e4116b4 (patch)
treece5457fcd1e1bbc2ab968a675d235b7ffb6edf53 /tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
parent7340bc73f2bf2bea7c5c3edf700351dd5dd19e23 (diff)
downloadmaster-31e0f0ae-0b4e8c4c364368491714d80e465c71625e4116b4.tar.gz
master-31e0f0ae-0b4e8c4c364368491714d80e465c71625e4116b4.tar.bz2
master-31e0f0ae-0b4e8c4c364368491714d80e465c71625e4116b4.zip
automake: update to 1.11.6
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 39108
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)