diff options
Diffstat (limited to 'meta/classes/autotools.bbclass')
| -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() { | |||
| 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. |