summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-09 12:55:08 +0000
committerlars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-09 12:55:08 +0000
commit3286421e3602e8a0b472dc26602559aa51b2cf80 (patch)
tree437529cc35449888699e44e8657ab162ac2327c8
parent78ba806154aa3ed90802d0d6400aceccd62baf65 (diff)
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
-rwxr-xr-xtools/automake/files/aclocal13
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal
index a586ccc61..60278e2ab 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 $@