aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2008-10-09 12:55:08 +0000
committerLars-Peter Clausen <lars@metafoo.de>2008-10-09 12:55:08 +0000
commit6b4e3e7609c9bb00df8c9c1e789ef95d95df69ab (patch)
tree35d6597402a510ca0b7e010fc922015878042d15 /tools
parent34837ea2ddce6d22d90eda3ffe198c6ba6267167 (diff)
downloadupstream-6b4e3e7609c9bb00df8c9c1e789ef95d95df69ab.tar.gz
upstream-6b4e3e7609c9bb00df8c9c1e789ef95d95df69ab.tar.bz2
upstream-6b4e3e7609c9bb00df8c9c1e789ef95d95df69ab.zip
Check for existence of target aclocal folder before including them.
SVN-Revision: 12934
Diffstat (limited to 'tools')
-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 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 $@