summaryrefslogtreecommitdiff
path: root/uclibc
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-01-13 17:12:50 +0000
committerChris Larson <clarson@kergoth.com>2004-01-13 17:12:50 +0000
commitc66ca9c303bb6078b513c6b0f528667da74396ee (patch)
tree6313474cc0dc81f68d8e860834eed46dce44fe87 /uclibc
parentfc22411e12ff4762ec5997d543c5637398580437 (diff)
Merge direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/paths
into direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/packages 2004/01/13 11:10:14-06:00 ti.com!kergoth Merge openembedded@openembedded.bkbits.net:packages into direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/paths 2004/01/13 10:56:32-06:00 ti.com!kergoth Remove hardcoded references to target paths in a number of packages, replacing them with the use of our target path variables. 2004/01/13 17:40:06+01:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages into gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/oe-packages 2004/01/13 14:24:53+01:00 uni-frankfurt.de!mickeyl add pyserial and sgmlop to buildsystem BKrev: 40042712PUToOUzefh1XdY4q23VfEA
Diffstat (limited to 'uclibc')
-rw-r--r--uclibc/uclibc-initial_0.9.21.oe2
-rw-r--r--uclibc/uclibc_0.9.21.oe16
2 files changed, 9 insertions, 9 deletions
diff --git a/uclibc/uclibc-initial_0.9.21.oe b/uclibc/uclibc-initial_0.9.21.oe
index 821b31fbcb..4f72ac74b5 100644
--- a/uclibc/uclibc-initial_0.9.21.oe
+++ b/uclibc/uclibc-initial_0.9.21.oe
@@ -12,7 +12,7 @@ do_stage() {
mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
- rm -rf ${CROSS_DIR}/${TARGET_SYS}/usr
+ rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
}
do_install() {
diff --git a/uclibc/uclibc_0.9.21.oe b/uclibc/uclibc_0.9.21.oe
index b021778837..d1088436f0 100644
--- a/uclibc/uclibc_0.9.21.oe
+++ b/uclibc/uclibc_0.9.21.oe
@@ -65,25 +65,25 @@ do_stage() {
done
# We don't really need these
- rmdir ${CROSS_DIR}/${TARGET_SYS}/usr/lib || :
- rmdir ${CROSS_DIR}/${TARGET_SYS}/usr || :
+ rmdir ${CROSS_DIR}/${TARGET_SYS}/${libdir} || :
+ rmdir ${CROSS_DIR}/${TARGET_SYS}/${prefix} || :
}
do_install() {
make DEVEL_PREFIX= SYSTEM_DEVEL_PREFIX= TARGET_PREFIX= \
- DEVEL_TOOL_PREFIX=/usr PREFIX=${D} \
+ DEVEL_TOOL_PREFIX=${prefix} PREFIX=${D} \
install_dev install_target install_target_utils
# binutils has a readelf, so forget about this one...
- rm -f ${D}/usr/bin/readelf
+ rm -f ${D}/${bindir}/readelf
- # move devel headers/libs/objects from / into /usr
- mv -f ${D}/lib/*.a ${D}/lib/*.o ${D}/usr/lib/
+ # move devel headers/libs/objects from / into ${prefix}
+ mv -f ${D}/lib/*.a ${D}/lib/*.o ${D}${libdir}/
rm -f ${D}/include/.cvsignore
- mv -f ${D}/include ${D}/usr/
+ mv -f ${D}/include ${D}${prefix}/
for lib in libc.so libcrypt.so libdl.so libm.so libnsl.so \
libpthread.so libresolv.so libthread_db.so libutil.so; do
- ln -s ../../lib/`readlink ${D}/lib/$lib` ${D}/usr/lib/$lib
+ ln -s ../../lib/`readlink ${D}/lib/$lib` ${D}${libdir}/$lib
rm -f ${D}/lib/$lib
done