From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 9 Oct 2008 12:55:08 +0000 (+0000)
Subject: Check for existence of target aclocal folder before including them.
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=3286421e3602e8a0b472dc26602559aa51b2cf80

Check for existence of target aclocal folder before including them.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12934 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal
index a586ccc61f..60278e2ab0 100755
--- a/tools/automake/files/aclocal
+++ b/tools/automake/files/aclocal
@@ -1,5 +1,10 @@
 #!/usr/bin/env sh
-aclocal.real \
-    -I ${STAGING_DIR}/host/share/aclocal \
-    -I ${STAGING_DIR}/usr/share/aclocal \
-    $@
+if [ -d ${STAGING_DIR}/host/share/aclocal ]; then
+    aclocal_include_dirs="-I ${STAGING_DIR}/host/share/aclocal"
+else
+    aclocal_include_dirs=
+fi
+if [ -d ${STAGING_DIR}/usr/share/aclocal ]; then
+    aclocal_include_dirs="$aclocal_include_dirs -I ${STAGING_DIR}/usr/share/aclocal"
+fi
+aclocal.real $aclocal_include_dirs $@