diff options
| -rw-r--r-- | ext/extmk.rb.in | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 5b94f975a2..4ac7b4ee9b 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 ae593224e9..c042561e13 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"]} @@ -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 |