naruse	2012-07-29 04:32:10 +0900 (Sun, 29 Jul 2012)

  New Revision: 36561

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36561

  Log:
    merge revision(s) 34716:
    
    * template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir
      and {ruby,vendor,site}archdir.  [ruby-core:42766][Feature #6052]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/template/ruby.pc.in
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36560)
+++ ruby_1_9_3/ChangeLog	(revision 36561)
@@ -1,3 +1,8 @@
+Sun Jul 29 04:32:06 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir
+	  and {ruby,vendor,site}archdir.  [ruby-core:42766][Feature #6052]
+
 Sun Jul 29 04:31:01 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* bignum.c: Added #include <strings.h> for ffs(). Patch by Perry
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36560)
+++ ruby_1_9_3/version.h	(revision 36561)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 255
+#define RUBY_PATCHLEVEL 256
 
 #define RUBY_RELEASE_DATE "2012-07-29"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/template/ruby.pc.in
===================================================================
--- ruby_1_9_3/template/ruby.pc.in	(revision 36560)
+++ ruby_1_9_3/template/ruby.pc.in	(revision 36561)
@@ -24,6 +24,13 @@
 LIBS=@LIBS@
 DLDFLAGS=@DLDFLAGS@
 ruby=${bindir}/${RUBY_INSTALL_NAME}@EXEEXT@
+rubylibprefix=@rubylibprefix@
+rubylibdir=${rubylibprefix}/${ruby_version}
+vendordir=${rubylibprefix}/vendor_ruby
+sitedir=${rubylibprefix}/site_ruby
+rubyarchdir=${rubylibdir}/${arch}
+vendorarchdir=${vendordir}/${sitearch}
+sitearchdir=${sitedir}/${sitearch}
 rubyhdrdir=@rubyhdrdir@
 vendorhdrdir=@vendorhdrdir@
 sitehdrdir=@sitehdrdir@

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/