diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-10 16:10:07 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-10 16:10:07 +0000 |
| commit | 2356a4123376c49583f90906e4c7441541454ae8 (patch) | |
| tree | 441a9bcfae2b84dd86b1dcdfeaec321ccb9b0111 | |
| parent | 35198fb766eebcfa9e59b8209ea1705b582974b6 (diff) | |
| download | upstream-2356a4123376c49583f90906e4c7441541454ae8.tar.gz upstream-2356a4123376c49583f90906e4c7441541454ae8.tar.bz2 upstream-2356a4123376c49583f90906e4c7441541454ae8.zip | |
[tools] automake: rework patch; only skip when the directories does not exist, this preserves error cases like missing access permissions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24427 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | tools/automake/patches/100-aclocal-skip-not-existing-directories.patch | 17 |
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': $!"; |