aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-02 11:11:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-02 11:11:21 +0000
commit5f06ee7ea0d50ae91f5d92c449d4cedd1de497a6 (patch)
treefee638143580e5e2fa19f850688d2459618fc8f1
parente627955d140d10f8b3575f6a5d8efd5edf220cc5 (diff)
downloadruby-5f06ee7ea0d50ae91f5d92c449d4cedd1de497a6.tar.gz
mkmf.rb: timestamp_file
* lib/mkmf.rb (MakeMakefile#timestamp_file): remove @ which looks like configure variables. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/mkmf.rb2
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 56cd2b365a..82c8e08e24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Fri Nov 2 20:02:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 2 20:11:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (MakeMakefile#timestamp_file): remove @ which looks like
+ configure variables.
* lib/mkmf.rb (MakeMakefile#timestamp_file): use .-. instead of !, a
special character of NMAKE and BSD make. [Bug #7265]
@@ -17,7 +20,7 @@ Fri Nov 2 17:52:12 2012 Shugo Maeda <shugo@ruby-lang.org>
a refinement, returns a string in the format #<refinement:C@M>,
where C is a refined class and M is a module at which the refinemet
is defined.
-
+
* eval.c (rb_mod_refine): store information on a refinement for the
above change.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f67e4d0089..ded4e89814 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1859,7 +1859,7 @@ preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
end
def timestamp_file(name)
- name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "@" : $2 ? ".-." : "_"}
+ name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"}
"./.#{name}.time"
end
# :startdoc: