* common.mk (srcs): removed ID_H_TARGET.

* tool/generic_erb.rb: always overwrites if no if-change option.

* template/id.h.tmpl: shows which token differs.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 7 deletions

diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb
index c234f3a52f..f7ef48deea 100644
--- a/tool/generic_erb.rb
+++ b/tool/generic_erb.rb
@@ -16,13 +16,11 @@ erb = ERB.new(File.read(template), nil, '%')
 erb.filename = template
 result = erb.result
 if output
-  if ifchange
-    if (IO.read(output) rescue nil) == result
-      puts "#{output} unchanged"
-    else
-      open(output, "wb") {|f| f.print result}
-      puts "#{output} updated"
-    end
+  if ifchange and (IO.read(output) rescue nil) == result
+    puts "#{output} unchanged"
+  else
+    open(output, "wb") {|f| f.print result}
+    puts "#{output} updated"
   end
   if timestamp
     if timestamp == true