diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-26 15:35:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 11:10:57 +0000 |
| commit | 35d44a438d4ed815dad36bd3dae9cd1085234bfe (patch) | |
| tree | 02b2844845f45bda7ca1f2fc5c2b0a96fd3d3617 | |
| parent | 4e23e8f9d0e22cf534c19224cba0be9bedba0120 (diff) | |
| download | openembedded-core-35d44a438d4ed815dad36bd3dae9cd1085234bfe.tar.gz openembedded-core-35d44a438d4ed815dad36bd3dae9cd1085234bfe.tar.bz2 openembedded-core-35d44a438d4ed815dad36bd3dae9cd1085234bfe.zip | |
autotools.bbclass: Only include aclocal directories if the exist, no point in creating them
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/autotools.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 39f5036ecf..78fa66f590 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -109,9 +109,12 @@ autotools_do_configure() { AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"` automake --version echo "AUTOV is $AUTOV" - install -d ${STAGING_DATADIR}/aclocal - install -d ${STAGING_DATADIR}/aclocal-$AUTOV - acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV -I ${STAGING_DATADIR}/aclocal" + if [ -d ${STAGING_DATADIR}/aclocal-$AUTOV ]; then + acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV" + fi + if [ -d ${STAGING_DATADIR}/aclocal ]; then + acpaths="$acpaths -I ${STAGING_DATADIR}/aclocal" + fi # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look # like it was auto-generated. Work around this by blowing it away # by hand, unless the package specifically asked not to run aclocal. |