summaryrefslogtreecommitdiff
path: root/libtool
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-04-01 17:57:34 +0000
committerChris Larson <clarson@kergoth.com>2004-04-01 17:57:34 +0000
commit7d0f4d1ff2349647def5f78e6f07d4ce0bc7fffc (patch)
tree0e273dc0c82ac47904f723db0eaaa44679f0df66 /libtool
parent0851f86cd64bd723f578846da6676c8782ac65d7 (diff)
Merge http://openembedded.bkbits.net/packages
into linux.local:/home/kergoth/code/packages 2004/03/31 12:17:45-05:00 local!kergoth appweb_1.0.2.oe: Correct LD_LIBRARY_PATH referencing itself. tremor_20030325.oe: Correct the tremor include path passed into the staging make install. 2004/03/30 21:40:59-05:00 local!kergoth Some fixups per the latest staging changes. BKrev: 406c580emotmj9yxCNGAhNEinlE4uw
Diffstat (limited to 'libtool')
-rw-r--r--libtool/libtool-cross_1.5.oe12
-rw-r--r--libtool/libtool-native_1.5.oe12
2 files changed, 12 insertions, 12 deletions
diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe
index ef32aa112f..06ce17f27a 100644
--- a/libtool/libtool-cross_1.5.oe
+++ b/libtool/libtool-cross_1.5.oe
@@ -18,14 +18,14 @@ PACKAGES = ""
do_stage () {
oe_runmake install
- install -d ${STAGING_DIR}/share/{libtool,aclocal}
+ install -d ${STAGING_DATADIR}/{libtool,aclocal}
install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize
- install -c config.guess ${STAGING_DIR}/share/libtool/config.guess
- install -c config.sub ${STAGING_DIR}/share/libtool/config.sub
- install -c -m 0644 ltmain.sh ${STAGING_DIR}/share/libtool/
- install -c -m 0644 libtool.m4 ${STAGING_DIR}/share/aclocal/
- install -c -m 0644 ltdl.m4 ${STAGING_DIR}/share/aclocal/
+ install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
+ install -c config.sub ${STAGING_DATADIR}/libtool/config.sub
+ install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
+ install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
+ install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/
install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la
diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe
index ce694ac652..2e94d5c418 100644
--- a/libtool/libtool-native_1.5.oe
+++ b/libtool/libtool-native_1.5.oe
@@ -17,14 +17,14 @@ EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-"
do_stage () {
oe_runmake install
- install -d ${STAGING_DIR}/share/{libtool,aclocal}
+ install -d ${STAGING_DATADIR}/{libtool,aclocal}
install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize
- install -c config.guess ${STAGING_DIR}/share/libtool/config.guess
- install -c config.sub ${STAGING_DIR}/share/libtool/config.sub
- install -c -m 0644 ltmain.sh ${STAGING_DIR}/share/libtool/
- install -c -m 0644 libtool.m4 ${STAGING_DIR}/share/aclocal/
- install -c -m 0644 ltdl.m4 ${STAGING_DIR}/share/aclocal/
+ install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
+ install -c config.sub ${STAGING_DATADIR}/libtool/config.sub
+ install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
+ install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
+ install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/
install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la