autotools.bbclass: Only include aclocal directories if the exist, no point in creatin...

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 39f5036ecfad19e5575bafe856c138f219fb624b..78fa66f590ac831372b3eae2aa556d532b2d2882 100644 (file)
--- 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.