| In cross environment we have to prepend the sysroot to the path found by |
| pkgconfig since the path returned from pkgconfig does not have sysroot prefixed |
| it ends up using the files from host system. Now usually people have gnome installed |
| so the build succeeds but if you dont have gnome installed on build host then |
| it wont find the files on host system and packages using gnome-doc-utils wont |
| compile. |
| |
| This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR |
| will be empty |
| |
| Upstream-Status: Pending |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
| |
| Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make |
| =================================================================== |
| --- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make |
| +++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make |
| @@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ |
| _xml2po ?= `which xml2po` |
| _xml2po_mode = $(if $(DOC_ID),mallard,docbook) |
| |
| -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` |
| -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` |
| -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl |
| -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl |
| -_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl |
| +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` |
| +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` |
| +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl |
| +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl |
| +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl |
| |
| if ENABLE_SK |
| _ENABLE_SK = true |