mc: Fixed invalid references to staging bindir.

diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc
index 6bd3ebeb99712ca20a84b0aca470d485dc2efba7..9d00aca664398b836fd9bef4400fd67e5de2a499 100644 (file)
--- a/recipes/mc/mc.inc
+++ b/recipes/mc/mc.inc
@@ -12,7 +12,11 @@ SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.
 inherit autotools
 
 EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \
---without-nfs --without-gpm-mouse --with-screen=ncurses"
+--without-nfs --without-gpm-mouse --with-screen=ncurses \
+ac_cv_path_PERL=${bindir}/perl \
+ac_cv_path_ZIP=${bindir}/zip \
+ac_cv_path_UNZIP=${bindir}/unzip \
+"
 
 PACKAGES += "${PN}-extfs ${PN}-hilite"
 FILES_${PN} = "${bindir}/ ${libexecdir}/mc ${datadir}/mc/*.charsets ${datadir}/mc/*.ext ${datadir}/mc/*.hint ${datadir}/mc/*.hlp ${datadir}/mc/*.lib ${datadir}/mc/*.menu ${datadir}/mc/*.rc ${datadir}/mc/bin /etc/profile.d"

diff --git a/recipes/mc/mc_4.6.0.bb b/recipes/mc/mc_4.6.0.bb
index e5c18784be153ecfd5a8ec0a5fbc23d90e83d010..f060fff4bcb63e7357b3e0d65054f4957a1c099b 100644 (file)
--- a/recipes/mc/mc_4.6.0.bb
+++ b/recipes/mc/mc_4.6.0.bb
@@ -1,2 +1,2 @@
 require mc.inc
-PR = "r2"
+PR = "r3"

diff --git a/recipes/mc/mc_4.6.1.bb b/recipes/mc/mc_4.6.1.bb
index e5c18784be153ecfd5a8ec0a5fbc23d90e83d010..f060fff4bcb63e7357b3e0d65054f4957a1c099b 100644 (file)
--- a/recipes/mc/mc_4.6.1.bb
+++ b/recipes/mc/mc_4.6.1.bb
@@ -1,2 +1,2 @@
 require mc.inc
-PR = "r2"
+PR = "r3"

diff --git a/recipes/mc/mc_4.6.2.bb b/recipes/mc/mc_4.6.2.bb
index 75d2a1b551c15bac2375989a45600ebc8e95332a..10da272f795e96a4520f617daa2dc3b1a9be81af 100644 (file)
--- a/recipes/mc/mc_4.6.2.bb
+++ b/recipes/mc/mc_4.6.2.bb
@@ -1,5 +1,5 @@
 require mc.inc
-PR = "r2"
+PR = "r3"
 HOMEPAGE = "http://www.midnight-commander.org/"
 
 # most of these fixes were copied from openSUSE Factory.
@@ -23,8 +23,12 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${P}.tar.gz \
           file://mc-cursor-appearance.patch;patch=1 \
           file://mc-esc-seq.patch;patch=1"
 
-EXTRA_OECONF = "--without-x --without-samba \   
---without-nfs --without-gpm-mouse --enable-charset"
+EXTRA_OECONF = "--without-x --without-samba \
+--without-nfs --without-gpm-mouse --enable-charset \
+ac_cv_path_PERL=${bindir}/perl \
+ac_cv_path_ZIP=${bindir}/zip \
+ac_cv_path_UNZIP=${bindir}/unzip \
+"
 
 do_unpack_append() {
         bb.build.exec_func('do_utf8_conversion', d)