summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 14:35:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 15:18:49 +0100
commit23732f21b9cc261fb6abbd816196aa8579d90de5 (patch)
tree11c3757656b897c2f799d1ae9e1ba8cb5237e76a
parent940fc1953854ceb90e349dc9904cee7c7aa6fcc4 (diff)
downloadpoky-23732f21b9cc261fb6abbd816196aa8579d90de5.tar.gz
at: Use variables from the environment to override the makefile defaults
This allows us to remove the docdir worksarounds and fixes other potential relocation issues at the same time as cleaning up the recipe. (From OE-Core rev: 3be575babcdb12f95f4882d3c42bdf3ba1ec1900) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/at/at_3.1.13.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-extended/at/at_3.1.13.bb b/meta/recipes-extended/at/at_3.1.13.bb
index 9af35690f9..ce9396a005 100644
--- a/meta/recipes-extended/at/at_3.1.13.bb
+++ b/meta/recipes-extended/at/at_3.1.13.bb
@@ -11,7 +11,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
11 11
12RCONFLICTS_${PN} = "atd" 12RCONFLICTS_${PN} = "atd"
13RREPLACES_${PN} = "atd" 13RREPLACES_${PN} = "atd"
14PR = "r1" 14PR = "r2"
15 15
16SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ 16SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
17 file://configure.patch \ 17 file://configure.patch \
@@ -45,14 +45,12 @@ do_compile_prepend () {
45} 45}
46 46
47do_install () { 47do_install () {
48 oe_runmake "IROOT=${D}" install 48 oe_runmake -e "IROOT=${D}" install
49 49
50 install -d ${D}${sysconfdir}/init.d 50 install -d ${D}${sysconfdir}/init.d
51 install -d ${D}${sysconfdir}/rcS.d 51 install -d ${D}${sysconfdir}/rcS.d
52 install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd 52 install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd
53 ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at 53 ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at
54 cp -r ${D}/usr/doc/at ${D}${docdir}/
55 rm -rf ${D}/usr/doc
56 54
57 for feature in ${DISTRO_FEATURES}; do 55 for feature in ${DISTRO_FEATURES}; do
58 if [ "$feature" = "pam" ]; then 56 if [ "$feature" = "pam" ]; then