diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-28 19:32:36 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-28 19:32:36 +0000 |
commit | c30f4049f2f5935dc495d0c68bc299e7f8bdbcde (patch) | |
tree | ba94e1e811242ebe840e57ab4616b9f0d299f377 | |
parent | c557169258f72f0ccb4a6f57f53c2f793177070b (diff) |
merge revision(s) 34880:
* configure.in (ruby_pc): make configurable. [Bug #6051]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 5 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Jul 29 04:32:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (ruby_pc): make configurable. [Bug #6051] + Sun Jul 29 04:32:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir diff --git a/configure.in b/configure.in index f2af0ee910..be818d436e 100644 --- a/configure.in +++ b/configure.in @@ -3038,7 +3038,10 @@ AC_CONFIG_FILES(Makefile, [{ }], [EXEEXT='$EXEEXT' gnumake='$gnumake']) -ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc" +AC_ARG_WITH([ruby-pc], + AC_HELP_STRING([pc file basename]), + [ruby_pc="$withval"], + [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"]) AC_SUBST(ruby_pc) AC_SUBST(exec, [exec]) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 256 +#define RUBY_PATCHLEVEL 257 #define RUBY_RELEASE_DATE "2012-07-29" #define RUBY_RELEASE_YEAR 2012 |