From 406bd38b4232f9f399ef5ffe0b4fac72ed605a23 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 15 Oct 2012 15:19:10 -0700 Subject: bitbake.conf: change libexecdir to ${libdir}/${BPN} In order to be more compliant with the Filesystem Hierarchs Standard (FHS), this change removes the /usr/libexec default in favor of ${libdir}/${BPN} (which is typically /usr/lib). http://www.pathname.com/fhs/pub/fhs-2.3.html This also address the native and STAGING variations [YOCTO #2915] (From OE-Core rev: 68c31b095a1cb20bd297df596024fc568614f5e8) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 324dc9fd14..64bcd425c2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -35,8 +35,8 @@ export docdir = "${datadir}/doc" # Architecture dependent paths export bindir = "${exec_prefix}/bin" export sbindir = "${exec_prefix}/sbin" -export libexecdir = "${exec_prefix}/libexec" export libdir = "${exec_prefix}/${baselib}" +export libexecdir = "${libdir}/${BPN}" export includedir = "${exec_prefix}/include" export oldincludedir = "${exec_prefix}/include" export systemd_unitdir = "${base_libdir}/systemd" @@ -51,6 +51,7 @@ bindir_native = "${prefix_native}/bin" sbindir_native = "${prefix_native}/sbin" includedir_native = "${prefix_native}/include" libdir_native = "${prefix_native}/lib" +libexecdir_native = "${libdir_native}/${BPN}" base_libdir_native = "/lib" datadir_native = "${prefix_native}/share" bindir_cross = "/bin" @@ -350,6 +351,7 @@ STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts" STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" +STAGING_LIBEXECDIR_NATIVE = "${STAGING_DIR_NATIVE}${libexecdir_native}" STAGING_BASE_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${base_libdir_native}" STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" @@ -358,6 +360,7 @@ STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}" STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}" STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}" +STAGING_LIBEXECDIR = "${STAGING_DIR_HOST}${libexecdir}" STAGING_BASELIBDIR = "${STAGING_DIR_HOST}${base_libdir}" STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}" STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}" -- cgit v1.2.3