[ruby-gnome2-cvs] ruby-gnome2/pkg-config@2902b6c [master] Join paths only once

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-10 23:31:25 +0900 (Thu, 10 Aug 2017)

  New Revision: 2902b6c8442f76100725a721e5ee5c6eda77b96e
  https://github.com/ruby-gnome2/pkg-config/commit/2902b6c8442f76100725a721e5ee5c6eda77b96e

  Message:
    Join paths only once

  Modified files:
    lib/pkg-config.rb

  Modified: lib/pkg-config.rb (+13 -13)
===================================================================
--- lib/pkg-config.rb    2017-08-10 23:31:04 +0900 (542d1c3)
+++ lib/pkg-config.rb    2017-08-10 23:31:25 +0900 (d83fb5f)
@@ -358,23 +358,23 @@ class PackageConfig
     when "x64-mingw32"
       default_paths.concat(Dir.glob("c:/msys*/mingw64/lib/pkgconfig"))
     end
-    default_path = default_paths.join(SEPARATOR)
     libdir = ENV["PKG_CONFIG_LIBDIR"]
-    default_path = [libdir, default_path].join(SEPARATOR) if libdir
+    default_paths.unshift(libdir) if libdir
 
     pkg_config = self.class.native_pkg_config
-    return default_path unless pkg_config.absolute?
+    return default_paths.join(SEPARATOR) unless pkg_config.absolute?
+
     pkg_config_prefix = pkg_config.parent.parent
-    pkg_config_arch_depended_path =
-      Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s).join(SEPARATOR)
-    [
-      pkg_config_arch_depended_path,
-      (pkg_config_prefix + "lib64/pkgconfig").to_s,
-      (pkg_config_prefix + "libx32/pkgconfig").to_s,
-      (pkg_config_prefix + "lib/pkgconfig").to_s,
-      (pkg_config_prefix + "libdata/pkgconfig").to_s,
-      default_path,
-    ].join(SEPARATOR)
+    pkg_config_arch_depended_paths =
+      Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
+    paths = []
+    paths.concat(pkg_config_arch_depended_paths)
+    paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
+    paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
+    paths << (pkg_config_prefix + "lib/pkgconfig").to_s
+    paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
+    paths.concat(default_paths)
+    paths.join(SEPARATOR)
   end
 
   def required_packages