summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-07-06 07:37:50 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-07-06 07:37:50 +0000
commitd381c1341084cba3dac822fb720d005307ad9f54 (patch)
tree0155c73ae1ddeb7e0ad3934bec8be3539c3349b6
parentd1375688cdde3d094984f7f3a7bffe57306a0bca (diff)
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/extmk.rb.in6
-rw-r--r--lib/mkmf.rb4
-rw-r--r--version.h4
3 files changed, 3 insertions, 11 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 5b94f975a21..4ac7b4ee9b7 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -422,11 +422,7 @@ TARGET = #{target}
DLLIB = $(TARGET).#{$static ? $LIBEXT : "@DLEXT@"}
RUBY = #{ruby_interpreter} -I$(topdir) -I$(hdrdir)/lib
-<<<<<<< extmk.rb.in
-RM = $(RUBY) -r ftools -e "File::rm_f *Dir[ARGV.join(' ')]"
-=======
-RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])'
->>>>>>> 1.20
+RM = $(RUBY) -r ftools -e "File::rm_f(*Dir[ARGV.join(' ')])"
EXEEXT = @EXEEXT@
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ae593224e9d..c042561e13a 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -406,11 +406,7 @@ TARGET = #{target}
DLLIB = $(TARGET).#{CONFIG["DLEXT"]}
RUBY = #{CONFIG["ruby_install_name"]}
-<<<<<<< mkmf.rb
-RM = $(RUBY) -r ftools -e 'File::rm_f *Dir[ARGV.join(" ")]'
-=======
RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])'
->>>>>>> 1.22
EXEEXT = #{CONFIG["EXEEXT"]}
diff --git a/version.h b/version.h
index 8a2f242e29c..73eef6a2791 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.5.4"
-#define RUBY_RELEASE_DATE "2000-07-04"
+#define RUBY_RELEASE_DATE "2000-07-06"
#define RUBY_VERSION_CODE 154
-#define RUBY_RELEASE_CODE 20000704
+#define RUBY_RELEASE_CODE 20000706