diff options
Diffstat (limited to 'meta-oe/recipes-qt/qcanobserver')
-rw-r--r-- | meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb b/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb index aed190cb6..9bba75008 100644 --- a/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb +++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb | |||
@@ -16,13 +16,13 @@ S = "${WORKDIR}/qcanobserver/DeviceLib/linux/SocketCAN" | |||
16 | CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN" | 16 | CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN" |
17 | 17 | ||
18 | do_configure_prepend() { | 18 | do_configure_prepend() { |
19 | sed -i s:/usr/include/qwt5/:${STAGING_INCDIR}:g *.pro | 19 | sed -i s:/usr/include/qwt5/:${STAGING_INCDIR}:g *.pro |
20 | } | 20 | } |
21 | 21 | ||
22 | do_install() { | 22 | do_install() { |
23 | install -d ${D}${datadir}/qcanobserver/lib | 23 | install -d ${D}${datadir}/qcanobserver/lib |
24 | 24 | ||
25 | install -m 0755 ${S}/lib* ${D}${datadir}/qcanobserver/lib/ | 25 | install -m 0755 ${S}/lib* ${D}${datadir}/qcanobserver/lib/ |
26 | } | 26 | } |
27 | 27 | ||
28 | FILES_${PN} += "${datadir}/qcanobserver/lib" | 28 | FILES_${PN} += "${datadir}/qcanobserver/lib" |
diff --git a/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb b/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb index 3d79fdc6c..ef866b445 100644 --- a/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb +++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb | |||
@@ -19,23 +19,23 @@ S = "${WORKDIR}/qcanobserver/" | |||
19 | CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN" | 19 | CXXFLAGS += " -DPF_CAN=29 -DAF_CAN=PF_CAN" |
20 | 20 | ||
21 | do_configure_prepend() { | 21 | do_configure_prepend() { |
22 | sed -i -e s:/usr/include/qwt5/:${STAGING_INCDIR}:g -e 's:-L/usr/lib/:-L${STAGING_DIR_TARGET}/lib -ldl:g' *.pro | 22 | sed -i -e s:/usr/include/qwt5/:${STAGING_INCDIR}:g -e 's:-L/usr/lib/:-L${STAGING_DIR_TARGET}/lib -ldl:g' *.pro |
23 | } | 23 | } |
24 | 24 | ||
25 | do_configure_append() { | 25 | do_configure_append() { |
26 | sed -i -e s:-L/usr/lib::g Makefile | 26 | sed -i -e s:-L/usr/lib::g Makefile |
27 | } | 27 | } |
28 | 28 | ||
29 | do_install() { | 29 | do_install() { |
30 | install -d ${D}${datadir}/qcanobserver | 30 | install -d ${D}${datadir}/qcanobserver |
31 | install -d ${D}${datadir}/qcanobserver/cfg | 31 | install -d ${D}${datadir}/qcanobserver/cfg |
32 | install -d ${D}${datadir}/qcanobserver/lib | 32 | install -d ${D}${datadir}/qcanobserver/lib |
33 | install -d ${D}${datadir}/qcanobserver/db | 33 | install -d ${D}${datadir}/qcanobserver/db |
34 | 34 | ||
35 | install -m 0755 ${S}/QCanObserver ${D}${datadir}/qcanobserver | 35 | install -m 0755 ${S}/QCanObserver ${D}${datadir}/qcanobserver |
36 | 36 | ||
37 | install -m 0644 ${WORKDIR}/candemo.xml ${D}${datadir}/qcanobserver/db | 37 | install -m 0644 ${WORKDIR}/candemo.xml ${D}${datadir}/qcanobserver/db |
38 | install -m 0644 ${S}/db/*.xml ${D}${datadir}/qcanobserver/db | 38 | install -m 0644 ${S}/db/*.xml ${D}${datadir}/qcanobserver/db |
39 | } | 39 | } |
40 | 40 | ||
41 | FILES_${PN}-dbg += "${datadir}/qcanobserver/.debug" | 41 | FILES_${PN}-dbg += "${datadir}/qcanobserver/.debug" |