summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-26 15:35:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-27 11:10:57 (GMT)
commit35d44a438d4ed815dad36bd3dae9cd1085234bfe (patch)
tree02b2844845f45bda7ca1f2fc5c2b0a96fd3d3617
parent4e23e8f9d0e22cf534c19224cba0be9bedba0120 (diff)
downloadpoky-35d44a438d4ed815dad36bd3dae9cd1085234bfe.tar.gz
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.bbclass9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 39f5036..78fa66f 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -109,9 +109,12 @@ autotools_do_configure() {
109 AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"` 109 AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"`
110 automake --version 110 automake --version
111 echo "AUTOV is $AUTOV" 111 echo "AUTOV is $AUTOV"
112 install -d ${STAGING_DATADIR}/aclocal 112 if [ -d ${STAGING_DATADIR}/aclocal-$AUTOV ]; then
113 install -d ${STAGING_DATADIR}/aclocal-$AUTOV 113 acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV"
114 acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV -I ${STAGING_DATADIR}/aclocal" 114 fi
115 if [ -d ${STAGING_DATADIR}/aclocal ]; then
116 acpaths="$acpaths -I ${STAGING_DATADIR}/aclocal"
117 fi
115 # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look 118 # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
116 # like it was auto-generated. Work around this by blowing it away 119 # like it was auto-generated. Work around this by blowing it away
117 # by hand, unless the package specifically asked not to run aclocal. 120 # by hand, unless the package specifically asked not to run aclocal.