summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb4
-rw-r--r--version.h8
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f7c7b5c5b..019986bc4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 2 07:38:43 2010 Nobuyoshi Nakada <[email protected]>
+
+ * lib/mkmf.rb (dir_config): should not modify argument arrays
+ themselves.
+
Thu Apr 29 18:39:51 2010 Nobuyoshi Nakada <[email protected]>
* lib/thwait.rb (ThreadsWait#join): refined rdoc again.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index bef627ab02..aa720ba962 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1304,7 +1304,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
ldir = with_config(target + "-lib", ldefault)
$arg_config.last[1] ||= "${#{target}-dir}/lib"
- idirs = idir ? Array === idir ? idir : idir.split(File::PATH_SEPARATOR) : []
+ idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
if defaults
idirs.concat(defaults.collect {|d| d + "/include"})
idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
@@ -1317,7 +1317,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
end
end
- ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : []
+ ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : []
if defaults
ldirs.concat(defaults.collect {|d| d + "/lib"})
ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
diff --git a/version.h b/version.h
index 11a532eba6..f6c8adff70 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-04-30"
+#define RUBY_RELEASE_DATE "2010-05-02"
#define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100430
+#define RUBY_RELEASE_CODE 20100502
#define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2010
-#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 2
#define NO_STRING_LITERAL_CONCATENATION 1
#ifdef RUBY_EXTERN