From: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu, 9 Oct 2008 12:55:08 +0000 (+0000)
Subject: Check for existence of target aclocal folder before including them.
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=6b4e3e7609c9bb00df8c9c1e789ef95d95df69ab;p=openwrt%2Fstaging%2Fdedeckeh.git

Check for existence of target aclocal folder before including them.

SVN-Revision: 12934
---

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 $@