3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 131cac680e..7f43a77534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec  6 18:33:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): added RM and CP.  [ruby-dev:37288]
+
 Sat Dec  6 17:51:35 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* pack.c (pack_pack): 'u0' is not special differently from 'm0'.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 25d61a7954..7b257f3d1b 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -151,6 +151,8 @@ def package(rev, destdir)
         f.puts "s,@OBJEXT@,|#_!!_#|o,g"
         f.puts "s,@LIBRUBY@,|#_!!_#|liburyb.a,g"
         f.puts "s,@LIBRUBY_A@,|#_!!_#|liburyb.a,g"
+        f.puts "s,@RM@,|#_!!_#|rm -f,g"
+        f.puts "s,@CP@,|#_!!_#|cp,g"
       }
       FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
       File.open("#{hdrdir}/config.h", "w") {}
diff --git a/version.h b/version.h
index f00e94ecdb..bbe89aa59a 100644
--- a/version.h
+++ b/version.h
@@ -32,7 +32,7 @@ RUBY_EXTERN const char ruby_copyright[];
 #define RUBY_REVISION 0
 #endif
 
-#if RUBY_PATCHLEVEL
+#if RUBY_PATCHLEVEL && RUBY_PATCHLEVEL < 5000
 #define RUBY_PATCHLEVEL_STR " patchlevel "STRINGIZE(RUBY_PATCHLEVEL)
 #else
 #define RUBY_PATCHLEVEL_STR ""