From 4fe1acbe3b9ce058264e1a9e43d179a62ab5daa2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Apr 2013 10:04:45 +0000 Subject: nodejs4: reinstate installing all the files Cloud9 needs the headers to build the o3-xml binary, using 0.8.x headers makes it crash. This installs everything namespaced as 'node4' to avoid collisions. Signed-off-by: Koen Kooi Signed-off-by: Martin Jansa --- meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'meta-oe/recipes-devtools/nodejs') diff --git a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb index 522b5396a7..58ca135273 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb @@ -28,8 +28,20 @@ do_compile () { } do_install () { - install -d ${D}${bindir} - install -m 0755 build/default/node ${D}${bindir}/node4 -} + DESTDIR=${D} oe_runmake install + + # fix namespace conflicts with other nodejs recipes + mv ${D}${bindir}/node ${D}${bindir}/node4 + mv ${D}${bindir}/node-waf ${D}${bindir}/node4-waf + + mv ${D}${includedir}/node ${D}${includedir}/node4 + mv ${D}${libdir}/node ${D}${libdir}/node4 + mv ${D}${libdir}/pkgconfig/nodejs.pc ${D}${libdir}/pkgconfig/nodejs4.pc + sed -i -e s:include/node:include/node4: ${D}${libdir}/pkgconfig/nodejs4.pc + + mv ${D}${datadir}/man/man1/node.1 ${D}${datadir}/man/man1/node4.1 +} +FILES_${PN} += "${libdir}/node4/wafadmin" +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf