[cairo-commit] rcairo ChangeLog, 1.272, 1.273 pkg-config.rb, 1.17, 1.18

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv28827

Modified Files:
	ChangeLog pkg-config.rb 
Log Message:
* pkg-config.rb: add libdata.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -d -r1.272 -r1.273
--- ChangeLog	20 Jun 2008 08:48:56 -0000	1.272
+++ ChangeLog	20 Jun 2008 11:51:06 -0000	1.273
@@ -1,5 +1,7 @@
 2008-06-20  Kouhei Sutou  <kou at cozmixng.org>
 
+	* pkg-config.rb: add libdata.
+
 	* pkg-config.rb:
 	- add /opt/local/lib/pkgconfig as default path.
 	- improve default path guess.

Index: pkg-config.rb
===================================================================
RCS file: /cvs/cairo/rcairo/pkg-config.rb,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pkg-config.rb	20 Jun 2008 08:48:56 -0000	1.17
+++ pkg-config.rb	20 Jun 2008 11:51:07 -0000	1.18
@@ -202,6 +202,7 @@
   def guess_default_path
     default_path = ["/usr/local/lib64/pkgconfig",
                     "/usr/local/lib/pkgconfig",
+                    "/usr/local/libdata/pkgconfig",
                     "/opt/local/lib/pkgconfig",
                     "/usr/lib64/pkgconfig",
                     "/usr/lib/pkgconfig",
@@ -222,6 +223,7 @@
 
     return default_path unless pkg_config.absolute?
     [(pkg_config.parent.parent + "lib" + "pkgconfig").to_s,
+     (pkg_config.parent.parent + "libdata" + "pkgconfig").to_s,
      default_path].join(separator)
   end
 end