diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Mar 4 23:53:18 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + (merge r39291) + * configure.in (opt-dir): remove debug print. + Mon Mar 4 23:42:34 2013 Zachary Scott <zachary@zacharyscott.net> * ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz diff --git a/configure.in b/configure.in index 8f2787734f..4c349880fd 100644 --- a/configure.in +++ b/configure.in @@ -2377,13 +2377,11 @@ AC_ARG_WITH(opt-dir, [ val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"` CPPFLAGS="$CPPFLAGS $val" - set -x val=`IFS="$PATH_SEPARATOR" for dir in $withval; do echo x ${LIBPATHFLAG} ${RPATHFLAG} | sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g" done | tr '\012' ' '` - set +x LDFLAGS_OPTDIR="$val" LDFLAGS="$LDFLAGS${LDFLAGS:+ }$val" DLDFLAGS="$DLDFLAGS${DLDFLAGS:+ }$val" @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-04" -#define RUBY_PATCHLEVEL 12 +#define RUBY_PATCHLEVEL 13 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 |