From c30f4049f2f5935dc495d0c68bc299e7f8bdbcde Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 28 Jul 2012 19:32:36 +0000 Subject: 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 --- ChangeLog | 4 ++++ configure.in | 5 ++++- version.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 487f50c9c7..6c9da63ada 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jul 29 04:32:31 2012 Nobuyoshi Nakada + + * configure.in (ruby_pc): make configurable. [Bug #6051] + Sun Jul 29 04:32:06 2012 Nobuyoshi Nakada * 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]) diff --git a/version.h b/version.h index 503eb91f4b..bb58aa0ba3 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3