From 8f591af937c7422c33ccde9af9c18e17f73450e2 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 10 Dec 2010 16:10:07 +0000
Subject: [PATCH] automake: rework patch; only skip when the directories does
not exist, this preserves error cases like missing access permissions
SVN-Revision: 24427
---
...-aclocal-skip-not-existing-directories.patch | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 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 1df30300d9..c049b835d2 100644
--- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
+++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -1,12 +1,15 @@
--- a/aclocal.in
+++ b/aclocal.in
-@@ -311,7 +311,8 @@ sub scan_m4_dirs ($@)
+@@ -309,6 +309,12 @@ sub scan_m4_dirs ($@)
+
+ foreach my $m4dir (@dirlist)
{
++ if (! -d $m4dir)
++ {
++ msg ('override', "warning: skipping not existing directory `$m4dir'");
++ next;
++ }
++
if (! opendir (DIR, $m4dir))
{
-- fatal "couldn't open directory `$m4dir': $!";
-+ msg ('override', "warning: skipping not existing directory `$m4dir'");
-+ next;
- }
-
- # We reverse the directory contents so that foo2.m4 gets
+ fatal "couldn't open directory `$m4dir': $!";
--
GitLab