aboutsummaryrefslogtreecommitdiffstats
path: root/classes/autotools.bbclass
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2005-12-26 09:57:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-12-26 09:57:00 +0000
commit89679b98e28d3400e6ceddc1c6bac1da671071fb (patch)
tree95b66a7a5dde7178b3653a1caff859863a76d37f /classes/autotools.bbclass
parent72e09dc3757283be06a4db309105e49d5d95ed4d (diff)
downloadopenembedded-89679b98e28d3400e6ceddc1c6bac1da671071fb.tar.gz
openembedded-89679b98e28d3400e6ceddc1c6bac1da671071fb.tar.bz2
openembedded-89679b98e28d3400e6ceddc1c6bac1da671071fb.zip
autotools.bbclass, base.bbclass: modify autotools_stage_all to use oe_libinstall and install aclocal macros, too
Diffstat (limited to 'classes/autotools.bbclass')
-rw-r--r--classes/autotools.bbclass29
1 files changed, 23 insertions, 6 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 8d448ce0d3..49d99614ed 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -151,15 +151,32 @@ autotools_stage_includes() {
}
autotools_stage_all() {
- if [ "${INHIBIT_AUTO_STAGE}" != "1" ]
+ if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
then
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- oe_runmake DESTDIR="${STAGE_TEMP}" install
+ return
+ fi
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake DESTDIR="${STAGE_TEMP}" install
+ if [ -d ${STAGE_TEMP}/${includedir} ]; then
cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
- cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
- rm -rf ${STAGE_TEMP}
fi
+ if [ -d ${STAGE_TEMP}/${libdir} ]
+ then
+ for i in ${STAGE_TEMP}/${libdir}/*.la
+ do
+ if [ ! -f "$i" ]; then
+ cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+ break
+ fi
+ oe_libinstall -a -so $(basename $i .la) ${STAGING_LIBDIR}
+ done
+ fi
+ if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
+ install -d ${STAGING_DATADIR}/aclocal
+ cp -pPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+ fi
+ rm -rf ${STAGE_TEMP}
}
EXPORT_FUNCTIONS do_configure do_install