summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-08 20:51:52 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-08 20:51:52 +0000
commitfc7c2faab331f570239dc8b782150791b434113a (patch)
treea1c726ef59bc2a7fbc348ab00baddcb8a6dd7b3a /lib
parent3b0faabbb546f0516cc725331ac049e3d1cceff9 (diff)
Revert r40194 "mkmf.rb: timestamp directory"
It breaks build. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 69fcd9810f..a02c3cd039 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1922,7 +1922,7 @@ preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
def timestamp_file(name)
name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"}
- "$(TIMESTAMP_DIR)/.#{name}.time"
+ "./.#{name}.time"
end
# :startdoc:
@@ -2174,7 +2174,6 @@ DLLIB = #{dllib}
EXTSTATIC = #{$static || ""}
STATIC_LIB = #{staticlib unless $static.nil?}
#{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
-TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'}
" #"
# TODO: fixme
install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
@@ -2268,7 +2267,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
dirs.unshift(sodir) if target and !dirs.include?(sodir)
dirs.each do |d|
t = timestamp_file(d)
- mfile.print "#{t}:\n\t$(Q) $(MAKEDIRS) $(@D) #{d}\n\t$(Q) $(TOUCH) $@\n"
+ mfile.print "#{t}:\n\t$(Q) $(MAKEDIRS) #{d}\n\t$(Q) $(TOUCH) $@\n"
end
mfile.print <<-SITEINSTALL