diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/pkgconfig.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/pkgconfig.bbclass b/meta/classes/pkgconfig.bbclass index f2054b0b07..416f34bb5c 100644 --- a/meta/classes/pkgconfig.bbclass +++ b/meta/classes/pkgconfig.bbclass | |||
@@ -23,6 +23,6 @@ do_stage_append () { | |||
23 | for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do | 23 | for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do |
24 | pcname=`basename $pc` | 24 | pcname=`basename $pc` |
25 | install -d ${PKG_CONFIG_PATH} | 25 | install -d ${PKG_CONFIG_PATH} |
26 | cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname | 26 | cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_DIR}/$pcname |
27 | done | 27 | done |
28 | } | 28 | } |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 804b7fd444..cb5069ab67 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -393,7 +393,8 @@ SLOT = "0" | |||
393 | 393 | ||
394 | # Other | 394 | # Other |
395 | 395 | ||
396 | export PKG_CONFIG_PATH = "${STAGING_DATADIR}/pkgconfig" | 396 | export PKG_CONFIG_DIR = "${STAGING_DATADIR}/pkgconfig" |
397 | export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" | ||
397 | export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" | 398 | export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" |
398 | 399 | ||
399 | export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" | 400 | export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" |