3 files changed, 5 insertions, 16 deletions

diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc
index 3ae98c8407..2c077011f8 100644
--- a/meta/recipes-devtools/autoconf/autoconf.inc
+++ b/meta/recipes-devtools/autoconf/autoconf.inc
@@ -17,10 +17,6 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
 
 inherit autotools
 
-PERLPATH = "${bindir}/perl"
-PERLPATH_virtclass-native = "/usr/bin/perl"
-PERLPATH_virtclass-nativesdk = "/usr/bin/perl"
-
 do_install_append() {
     rm -rf ${D}${datadir}/emacs
 
@@ -28,8 +24,8 @@ do_install_append() {
     # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
     for i in autoheader autom4te autoreconf autoscan autoupdate ifnames; do
         if [ -f ${D}${bindir}/$i ]; then
-            sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \
-            -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \
+            sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
+            -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \
             ${D}${bindir}/$i
         fi
     done
diff --git a/meta/recipes-devtools/automake/automake_1.12.1.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb
index c2bc6a3068..a1e37d471c 100644
--- a/meta/recipes-devtools/automake/automake_1.12.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.12.1.bb
@@ -34,10 +34,6 @@ PATHFIXPATCH = "file://path_prog_fixes.patch"
 PATHFIXPATCH_virtclass-native = ""
 PATHFIXPATCH_virtclass-nativesdk = ""
 
-PERLPATH = "${bindir}/perl"
-PERLPATH_virtclass-native = "/usr/bin/perl"
-PERLPATH_virtclass-nativesdk = "/usr/bin/perl"
-
 SRC_URI += "${PATHFIXPATCH} \
             file://prefer-cpio-over-pax-for-ustar-archives.patch \
             file://python-libdir.patch \
@@ -56,8 +52,8 @@ do_install () {
     # 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
         if [ -f ${D}${bindir}/$i ]; then
-            sed -i -e '1s,#!.*perl,#! ${PERLPATH},' \
-            -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${PERLPATH} \1 exec ${PERLPATH} \2,' \
+            sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/perl,' \
+            -e 's,exec .*/bin/perl \(.*\) exec .*/bin/perl \(.*\),exec ${USRBINPATH}/perl \1 exec ${USRBINPATH}/perl \2,' \
             ${D}${bindir}/$i
         fi
     done
diff --git a/meta/recipes-devtools/quilt/quilt_0.60.bb b/meta/recipes-devtools/quilt/quilt_0.60.bb
index 89c3f84f39..d866032188 100644
--- a/meta/recipes-devtools/quilt/quilt_0.60.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.60.bb
@@ -9,15 +9,12 @@ PR = "r1"
 
 CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
 
-PERLPATH = "${bindir}/env perl"
-PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
-
 # fix build-distro specific perl path in the target perl scripts
 do_install_append() {
         for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards
         do
                 if [ -f $perlscript ]; then
-                        sed -i -e '1s,#!.*perl,#! ${PERLPATH},' $perlscript
+                        sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' $perlscript
                 fi
         done
 }