blob: e17e8b4ec3d951608cb5cf074753af278594e12a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
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>
Index: gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make
===================================================================
--- gnome-doc-utils-0.20.6.orig/tools/gnome-doc-utils.make 2011-09-23 22:22:26.000000000 -0700
+++ gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make 2011-09-23 22:30:03.479787196 -0700
@@ -133,12 +133,12 @@ _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`
-_malrng ?= `$(PKG_CONFIG) --variable malrng 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`
+_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng 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
|
