[gtk-doc] depscan/fixxref/rebase: Don't hardcode pkg-config binary



commit 64d940b45474c4e98c4ed9bb035248a40145527d
Author: Marvin Schmidt <marv exherbo org>
Date:   Sun Jun 5 10:13:56 2016 +0200

    depscan/fixxref/rebase: Don't hardcode pkg-config binary
    
    `pkg-config` is not necessarily the correct pkg-config binary,
    especially in cross-compilation scenarios. Use the pkg-config binary
    that PKG_PROG_PKG_CONFIG (which looks for host-prefixed pkg-config)
    found and defined in PKG_CONFIG
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767271

 gtkdoc-depscan.in |    2 +-
 gtkdoc-fixxref.in |    2 +-
 gtkdoc-rebase.in  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in
index 83af01b..accc7d0 100644
--- a/gtkdoc-depscan.in
+++ b/gtkdoc-depscan.in
@@ -264,7 +264,7 @@ def merge_gnome_path(options):
     path = path and path.split(':') or []
 
     prefix = popen(
-        'pkg-config --variable=prefix glib-2.0'
+        '@PKG_CONFIG@ --variable=prefix glib-2.0'
         ).readline().rstrip()
 
     path.insert(0, prefix)
diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
index fc4b25c..88d28c2 100755
--- a/gtkdoc-fixxref.in
+++ b/gtkdoc-fixxref.in
@@ -124,7 +124,7 @@ EOF
 
     # We scan the directory containing GLib and any directories in GNOME2_PATH
     # first, but these will be overriden by any later scans.
-    $dir = `pkg-config --variable=prefix glib-2.0`;
+    $dir = ` PKG_CONFIG@ --variable=prefix glib-2.0`;
     $dir =~ s/\s+$//;
     $dir = $dir . "/share/gtk-doc/html";
     if (-d $dir) {
diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in
index 30db903..5e11b1e 100644
--- a/gtkdoc-rebase.in
+++ b/gtkdoc-rebase.in
@@ -116,7 +116,7 @@ EOF
         }
     }
 
-    $dir = `pkg-config --variable=prefix glib-2.0`;
+    $dir = ` PKG_CONFIG@ --variable=prefix glib-2.0`;
     $dir =~ s/^\s*(\S*)\s*$/$1/;
     $dir = $dir . "/share/gtk-doc/html";
     print "Prepending GLib directory $dir\n" if $VERBOSE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]