diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-05-16 13:15:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-05-16 13:15:35 +0000 |
| commit | 9c1cf5640fac3f7659d645aac99548d3051f41a5 (patch) | |
| tree | 2ecf9615e320e3b48f0ce67583d246d165318587 | |
| parent | 4fb411cd0319c10ed6ef94450ee8809af7a9dd71 (diff) | |
| download | poky-9c1cf5640fac3f7659d645aac99548d3051f41a5.tar.gz | |
bitbake.conf: PKG_CONFIG_PATH is a PATH like variable and may contain multiple entries so create PKG_CONFIG_DIR as a path to install to.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1731 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -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" |
