diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2008-10-09 12:55:08 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2008-10-09 12:55:08 +0000 |
| commit | 5396ed06394d83eef95601e893251869ddf1a591 (patch) | |
| tree | 437529cc35449888699e44e8657ab162ac2327c8 /tools/automake | |
| parent | 31b995b49c3ffad7e57ed00a21d1fd607397cd04 (diff) | |
| download | master-187ad058-5396ed06394d83eef95601e893251869ddf1a591.tar.gz master-187ad058-5396ed06394d83eef95601e893251869ddf1a591.tar.bz2 master-187ad058-5396ed06394d83eef95601e893251869ddf1a591.zip | |
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
Diffstat (limited to 'tools/automake')
| -rwxr-xr-x | tools/automake/files/aclocal | 13 |
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 $@ |