diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 1 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Tue Dec 24 00:18:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (configuration): strip destdir part from prefix to get + rid of duplication. a patch by arton at [ruby-core:58859]. + [ruby-core:58856] [Bug #9213] + Mon Dec 23 22:37:01 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * proc.c (mnew_from_me): method by respond_to_missing? should be diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 7653cc6a43..d7dc1b1a9b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1811,6 +1811,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} prefix = mkintpath(CONFIG["prefix"]) if destdir = prefix[$dest_prefix_pattern, 1] mk << "\nDESTDIR = #{destdir}\n" + prefix = prefix[destdir.size..-1] end mk << "prefix = #{with_destdir(prefix).unspace}\n" CONFIG.each do |key, var| @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-12-23" -#define RUBY_PATCHLEVEL 372 +#define RUBY_RELEASE_DATE "2013-12-24" +#define RUBY_PATCHLEVEL 373 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" |