diff options
Diffstat (limited to 'packages/uclibc/uclibc.inc')
| -rw-r--r-- | packages/uclibc/uclibc.inc | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index a308926b86..04b5492da3 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -152,16 +152,23 @@ do_install() { # This conflicts with the c++ version of this header rm -f ${D}${prefix}/include/bits/atomicity.h - install -d ${D}${includedir} - mv ${D}${prefix}/include/* ${D}${includedir}/ - rmdir ${D}${prefix}/include - - install -d ${D}${libdir} - mv ${D}${prefix}/lib/* ${D}${libdir}/ - rmdir ${D}${prefix}/lib - - install -d ${D}${bindir} - mv ${D}usr/bin/* ${D}${bindir}/ - rmdir ${D}usr/bin + # ugh.. uclibc doesn't like obeying our path variables. + if [ "${includedir}" != "${prefix}/include" ]; then + install -d ${D}${includedir} + mv ${D}${prefix}/include/* ${D}${includedir}/ + rmdir ${D}${prefix}/include + fi + + if [ "${libdir}" != "${prefix}/lib" ]; then + install -d ${D}${libdir} + mv ${D}${prefix}/lib/* ${D}${libdir}/ + rmdir ${D}${prefix}/lib + fi + + if [ "${bindir}" != "/usr/bin" ]; then + install -d ${D}${bindir} + mv ${D}/usr/bin/* ${D}${bindir}/ + rmdir ${D}/usr/bin + fi } |