diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-28 19:32:10 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-28 19:32:10 +0000 |
commit | c557169258f72f0ccb4a6f57f53c2f793177070b (patch) | |
tree | 84a0c2e186f2ecd139248cb9f00d4d29fb9b9da5 | |
parent | 02385465718d41fbc220fa061be42813057702b2 (diff) |
merge revision(s) 34716:
* template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir
and {ruby,vendor,site}archdir. [ruby-core:42766][Feature #6052]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | template/ruby.pc.in | 7 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Jul 29 04:32:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@gmail.com> * bignum.c: Added #include <strings.h> for ffs(). Patch by Perry diff --git a/template/ruby.pc.in b/template/ruby.pc.in index 2189667c5e..2d6716c73c 100644 --- a/template/ruby.pc.in +++ b/template/ruby.pc.in @@ -24,6 +24,13 @@ LIBRUBYARG=@LIBRUBYARG@ 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@ @@ -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 |