diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-07 22:34:17 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-07 23:36:05 +0100 |
commit | 87ffccb5dc184375e8807834e3b9b08ada708105 (patch) | |
tree | e1e98c92882cefbcba9ce187ec5b01ff5374861f /meta/recipes-devtools | |
parent | 61a43e54bf8fb4b06231e443a3ffe6832a8cca83 (diff) | |
download | poky-87ffccb5dc184375e8807834e3b9b08ada708105.tar.gz |
automake: Fix version reference in path substitutions
Without this the substitutions don't get made potentially resulting in a variety of
different failures.
(From OE-Core rev: 1e873271362b770381903098d46c4aec164d81de)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/automake/automake_1.12.1.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/automake/automake_1.12.1.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb index a1e37d471c..2a97bcc9aa 100644 --- a/meta/recipes-devtools/automake/automake_1.12.1.bb +++ b/meta/recipes-devtools/automake/automake_1.12.1.bb | |||
@@ -42,7 +42,7 @@ SRC_URI += "${PATHFIXPATCH} \ | |||
42 | SRC_URI[md5sum] = "ec25c1855cacf47e4bdee76a776b96ba" | 42 | SRC_URI[md5sum] = "ec25c1855cacf47e4bdee76a776b96ba" |
43 | SRC_URI[sha256sum] = "24bf1640679ba4a9cbe2d36422f39a81eced7f556b576a7a2ccfc70ca85a1e2f" | 43 | SRC_URI[sha256sum] = "24bf1640679ba4a9cbe2d36422f39a81eced7f556b576a7a2ccfc70ca85a1e2f" |
44 | 44 | ||
45 | PR = "r0" | 45 | PR = "r1" |
46 | 46 | ||
47 | do_install () { | 47 | do_install () { |
48 | oe_runmake 'DESTDIR=${D}' install | 48 | oe_runmake 'DESTDIR=${D}' install |
@@ -50,7 +50,7 @@ do_install () { | |||
50 | 50 | ||
51 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location | 51 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location |
52 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. | 52 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. |
53 | for i in aclocal aclocal-1.11 automake automake-1.11; do | 53 | for i in aclocal aclocal-1.12 automake automake-1.12; do |
54 | if [ -f ${D}${bindir}/$i ]; then | 54 | if [ -f ${D}${bindir}/$i ]; then |
55 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \ | 55 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \ |
56 | -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \ | 56 | -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \ |