aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-02 11:02:27 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-02 11:02:27 +0000
commite627955d140d10f8b3575f6a5d8efd5edf220cc5 (patch)
tree935642c2257dc49b283f9394312a2f9cf4bc5a75
parent7f6d21731c627b310b6853d80fdcc09bdcb424c9 (diff)
downloadruby-e627955d140d10f8b3575f6a5d8efd5edf220cc5.tar.gz
mkmf.rb: timestamp_file
* lib/mkmf.rb (MakeMakefile#timestamp_file): use .-. instead of !, a special character of NMAKE and BSD make. [Bug #7265] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cac282c0b1..56cd2b365a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 2 20:02:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (MakeMakefile#timestamp_file): use .-. instead of !, a
+ special character of NMAKE and BSD make. [Bug #7265]
+
Fri Nov 2 17:55:39 2012 Shota Fukumori <sorah@tubusu.net>
* lib/test/unit.rb (_run_parallel): Delete status line before showing
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 84d736dac0..f67e4d0089 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: