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 a586ccc61f31088ee35238532404bb0b2c180e6c..60278e2ab089ffde394c908e2b49ec6cb784c470 100755 (executable)
--- 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 $@