[DRE-commits] [SCM] ruby-pkg-config.git branch, master, updated. 1478d7c7c0fb15103b987ca45aa6283ead16f268

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit c1e585ed48b5312d39f41ba899bbabbf1510ed86
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sat Jul 2 12:49:42 2011 -0700

    Include arch-dependent pkgconfig directories
    
    This fixes Debian bug #632323:
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632323
    
    With this patch ruby-pkg-config will also look in directories for other
    architectures than i386 and amd64. The hardcoded lines for i386 and
    amd64 could even be completely removed, but I didn't do that to make
    sure it still works the same way as before on those architectures.

diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index 561d5d6..925cb69 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -270,12 +270,14 @@ class PackageConfig
   end
 
   def guess_default_path
+    arch_pkgconfig_dir = Dir.glob('/usr/lib/*/pkgconfig').join(SEPARATOR)
     default_path = ["/usr/local/lib64/pkgconfig",
                     "/usr/local/lib/pkgconfig",
                     "/usr/local/libdata/pkgconfig",
                     "/opt/local/lib/pkgconfig",
                     "/usr/lib/pkgconfig",
                     "/usr/lib64/pkgconfig",
+                    arch_pkgconfig_dir,
                     "/usr/lib/x86_64-linux-gnu/pkgconfig",
                     "/usr/lib/i386-linux-gnu/pkgconfig",
                     "/usr/X11/lib/pkgconfig/",

-- 
ruby-pkg-config.git