52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
|
Date: Tue, 25 Sep 2012 10:28:33 +0200
|
|
Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
same approach as used used in gnome-disk-utility:
|
|
|
|
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: Andreas Müller <schnitzeltony@googlemail.com>
|
|
---
|
|
gnome-doc-utils.make | 10 +++++-----
|
|
1 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
|
|
index 42d9df3..f71bbfa 100644
|
|
--- a/gnome-doc-utils.make
|
|
+++ b/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}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
|
|
|
|
if ENABLE_SK
|
|
_ENABLE_SK = true
|
|
--
|
|
1.7.6.5
|
|
|