Merge commit 'opendreambox/opendreambox-1.6' into vuplus-1.6

[vuplus_openembedded] / recipes / mc / mc.inc

diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc
old mode 100644 (file)
new mode 100755 (executable)
index 08257b2..fd3ffb6
--- a/recipes/mc/mc.inc
+++ b/recipes/mc/mc.inc
@@ -9,7 +9,7 @@ DEPENDS = "ncurses glib-2.0 glib-2.0-native"
 
 SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz"
 
-inherit autotools
+inherit autotools gettext
 
 EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \
 --without-nfs --without-gpm-mouse --with-screen=ncurses \
@@ -17,6 +17,7 @@ ac_cv_path_PERL=${bindir}/perl \
 ac_cv_path_ZIP=${bindir}/zip \
 ac_cv_path_UNZIP=${bindir}/unzip \
 "
+EXTRA_OEMAKE = 'GLIB_CFLAGS_FOR_BUILD="$GLIB_CFLAGS_FOR_BUILD" GLIB_LIBS_FOR_BUILD="$GLIB_LIBS_FOR_BUILD" CC_FOR_BUILD="$CC_FOR_BUILD"'
 
 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"
@@ -33,8 +34,10 @@ export CC_FOR_BUILD = "${BUILD_CC}"
 export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
 export LD_FOR_BUILD = "${BUILD_CC}"
 do_compile_prepend() {
-       export GLIB_CFLAGS_FOR_BUILD="`PKG_CONFIG_SYSROOT_DIR= PKG_CONFIG_PATH=${EXTRA_NATIVE_PKGCONFIG_PATH} ${STAGING_BINDIR_NATIVE}/pkg-config --cflags glib-2.0`"
-       export GLIB_LIBS_FOR_BUILD="`PKG_CONFIG_SYSROOT_DIR= PKG_CONFIG_PATH=${EXTRA_NATIVE_PKGCONFIG_PATH} ${STAGING_BINDIR_NATIVE}/pkg-config --libs glib-2.0`"
+       # FIXME: Ugly! Should be done globally with respect to the host system (in classes) instead of NATIVE_PKGCONFIG_PATH:
+       export HOST_PKG_CONFIG_PATH=
+       export GLIB_CFLAGS_FOR_BUILD="`PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" PKG_CONFIG_SYSROOT_DIR="" pkg-config --cflags glib-2.0`"
+       export GLIB_LIBS_FOR_BUILD="`PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" PKG_CONFIG_SYSROOT_DIR="" pkg-config --libs glib-2.0`"
 }
 
 do_install_append() {
@@ -44,6 +47,14 @@ do_install_append() {
        fi
 }
 
+do_install_append_opendreambox() {
+       rm -R ${D}/etc/profile.d
+}
+
+do_install_append_vuplus() {
+       rm -R ${D}/etc/profile.d
+}
+
 python populate_packages_prepend () {
        mcdir   = bb.data.expand('${datadir}/mc', d)
        do_split_packages(d, mcdir, '^mc\.[hm][ile][npn].*\.(.*)$',