diff options
| author | Openmoko anonymizer key <devel@lists.openmoko.org> | 2007-09-02 22:14:36 +0000 |
|---|---|---|
| committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2007-09-02 22:14:36 +0000 |
| commit | c1cfc8256ffcde3d0afd4de42b6f36b715c60dcb (patch) | |
| tree | dbd86d9a8c2879937d1b40602fc97597470329e6 /classes | |
| parent | 98081bc36be3bb72de6ff3e57bc1a713fb453879 (diff) | |
| parent | 31d144ff07c336393c2bc55ee5e486e17ee0bcfb (diff) | |
merge of '761183d571c60b5df965993faf1c23d3f933718b'
and 'd52a54d5f2ae378fe03f9c8d4cfb66d2d6a45d41'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/gnome.bbclass | 2 | ||||
| -rw-r--r-- | classes/gtk-binver.bbclass | 2 | ||||
| -rw-r--r-- | classes/pkgconfig.bbclass | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 8643989b73..56233578aa 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -13,8 +13,6 @@ FILES_${PN} += "${datadir}/application-registry ${datadir}/mime-info \ inherit autotools pkgconfig gconf -EXTRA_AUTORECONF += "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" - gnome_stage_includes() { autotools_stage_includes } diff --git a/classes/gtk-binver.bbclass b/classes/gtk-binver.bbclass index 8398cc5424..52082492e7 100644 --- a/classes/gtk-binver.bbclass +++ b/classes/gtk-binver.bbclass @@ -1,7 +1,7 @@ def gtkbinver_find(d): import bb try: - for line in file( "%s/gtk+-2.0.pc" % bb.data.getVar('PKG_CONFIG_PATH', d, 1) ).readlines(): + for line in file( "%s/gtk+-2.0.pc" % bb.data.getVar('PKG_CONFIG_DIR', d, 1) ).readlines(): if line.startswith( "gtk_binary_version" ): # bb.note( "gtk_binary_version = '%s'" % line.split("=")[1].strip() ) return line.split("=")[1].strip() diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index 3256977517..c795c8a709 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -31,7 +31,7 @@ do_install_append () { do_stage_append () { for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` - install -d ${PKG_CONFIG_PATH} - cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_PATH}/$pcname + install -d ${PKG_CONFIG_DIR} + cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_DIR}/$pcname done } |