[oe-commits] Richard Purdie : automake: Fix version reference in path substitutions

git at git.openembedded.org git at git.openembedded.org
Tue Aug 7 22:40:12 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: 1e873271362b770381903098d46c4aec164d81de
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1e873271362b770381903098d46c4aec164d81de

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Aug  7 22:34:17 2012 +0000

automake: Fix version reference in path substitutions

Without this the substitutions don't get made potentially resulting in a variety of
different failures.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 a1e37d4..2a97bcc 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} \
 SRC_URI[md5sum] = "ec25c1855cacf47e4bdee76a776b96ba"
 SRC_URI[sha256sum] = "24bf1640679ba4a9cbe2d36422f39a81eced7f556b576a7a2ccfc70ca85a1e2f"
 
-PR = "r0"
+PR = "r1"
 
 do_install () {
     oe_runmake 'DESTDIR=${D}' install
@@ -50,7 +50,7 @@ do_install () {
 
     # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
     # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
-    for i in aclocal aclocal-1.11 automake automake-1.11; do
+    for i in aclocal aclocal-1.12 automake automake-1.12; do
         if [ -f ${D}${bindir}/$i ]; then
             sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
             -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \





More information about the Openembedded-commits mailing list