aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-12-10 16:10:07 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-12-10 16:10:07 +0000
commit8f591af937c7422c33ccde9af9c18e17f73450e2 (patch)
tree6b2c30a04bbc9104b7195aa75024e7f25f929a32 /tools
parent1fa3e7a9418477a807b01c201fb26bf735b41fd7 (diff)
downloadupstream-8f591af937c7422c33ccde9af9c18e17f73450e2.tar.gz
upstream-8f591af937c7422c33ccde9af9c18e17f73450e2.tar.bz2
upstream-8f591af937c7422c33ccde9af9c18e17f73450e2.zip
automake: rework patch; only skip when the directories does not exist, this preserves error cases like missing access permissions
SVN-Revision: 24427
Diffstat (limited to 'tools')
-rw-r--r--tools/automake/patches/100-aclocal-skip-not-existing-directories.patch17
1 files 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': $!";