From 079efea07a338f6e8e5ece8ce0b64098e4a1fb34 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 19 Dec 2008 11:37:03 +0000 Subject: merges r20654 from trunk into ruby_1_9_1. * configure.in (rb_version): greps only the line that defines version. * version.h (RUBY_VERSION_CODE, RUBY_RELEASE_CODE): removed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- configure.in | 2 +- version.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 66d5de464..37a069455 100644 --- a/configure.in +++ b/configure.in @@ -64,7 +64,7 @@ GNU_LD=$rb_cv_prog_gnu_ld AC_SUBST(GNU_LD)]) unset GREP_OPTIONS -rb_version=`grep RUBY_VERSION $srcdir/version.h` +rb_version=`grep '^#define RUBY_VERSION ' $srcdir/version.h` MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'` MINOR=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*"'` TEENY=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)"'` diff --git a/version.h b/version.h index 5c485e4f2..99ba8fc0b 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,5 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2008-12-19" -#define RUBY_VERSION_CODE 191 -#define RUBY_RELEASE_CODE 20081219 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 -- cgit