summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/autotools.bbclass26
1 files changed, 18 insertions, 8 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 07b8735c2e..d65a151e60 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -175,14 +175,24 @@ autotools_stage_all() {
175 fi 175 fi
176 if [ -d ${STAGE_TEMP}/${libdir} ] 176 if [ -d ${STAGE_TEMP}/${libdir} ]
177 then 177 then
178 for i in ${STAGE_TEMP}/${libdir}/*.la 178 cd ${STAGE_TEMP}/${libdir}
179 do 179 las=$(find . -name \*.la -type f)
180 if [ ! -f "$i" ]; then 180 echo "Found la files: $las"
181 cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} 181 if [ -n "$las" ]; then
182 break 182 # If there are .la files then libtool was used in the
183 fi 183 # build, so install them with magic mangling.
184 oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR} 184 for i in $las
185 done 185 do
186 dir=$(dirname $i)
187 echo "oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}"
188 oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}
189 done
190 else
191 # Otherwise libtool wasn't used, and lib/ can be copied
192 # directly.
193 echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}"
194 cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
195 fi
186 fi 196 fi
187 if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then 197 if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
188 install -d ${STAGING_DATADIR}/aclocal 198 install -d ${STAGING_DATADIR}/aclocal