[DRE-commits] [SCM] ruby-pkg-config.git branch, master, updated. debian/1.1.2_git20110615-2-9-g9b20ef5

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 09ea167d12c34eff12329a3d8fb5796a29c4e81a
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Thu Aug 11 10:24:10 2011 -0700

    Revert "Include arch-dependent pkgconfig directories"
    
    This reverts commit c1e585ed48b5312d39f41ba899bbabbf1510ed86.

diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index 925cb69..561d5d6 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -270,14 +270,12 @@ 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