summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in4
-rw-r--r--ext/extmk.rb.in1
-rw-r--r--lib/mkmf.rb1
-rw-r--r--ruby.12
-rw-r--r--win32/Makefile.sub4
6 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ac2f02..7039df5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 6 14:50:24 2000 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/extmk.rb.in, lib/mkmf.rb: remove "DESTDIR =".
+
+ * Makefile.in, win32/Makefile.sub, ruby.1: renamed -X to -C.
+
Thu Oct 5 18:02:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (rb_obj_dup): should have propagated taint flag.
diff --git a/Makefile.in b/Makefile.in
index a2901c2..60cbd40 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,7 +83,7 @@ OBJS = array.@OBJEXT@ \
$(MISSING)
all: miniruby$(EXEEXT) @PREP@ rbconfig.rb $(LIBRUBY)
- @@MINIRUBY@ -Xext extmk.rb @EXTSTATIC@
+ @@MINIRUBY@ -Cext extmk.rb @EXTSTATIC@
miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) dmyext.@OBJEXT@
@rm -f $@
@@ -108,7 +108,7 @@ install: rbconfig.rb
clean:; @rm -f $(OBJS) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY_ALIASES) $(MAINOBJ) rbconfig.rb
@rm -f ext/extinit.c ext/extinit.@OBJEXT@ dmyext.@OBJEXT@
- @-@MINIRUBY@ -Xext extmk.rb clean 2> /dev/null || true
+ @-@MINIRUBY@ -Cext extmk.rb clean 2> /dev/null || true
@rm -f $(PROGRAM) miniruby$(EXEEXT)
distclean: clean
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 34a9d0d..a47fbed 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -381,7 +381,6 @@ VPATH = #{$srcdir}
topdir = #{$topdir}
hdrdir = #{$top_srcdir}
-DESTDIR =
CC = @CC@
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 659ecba..e7d4755 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -407,7 +407,6 @@ LDSHARED = #{CONFIG["LDSHARED"]} #{defflag}
RUBY_INSTALL_NAME = #{CONFIG["RUBY_INSTALL_NAME"]}
RUBY_SO_NAME = #{CONFIG["RUBY_SO_NAME"]}
-DESTDIR =
prefix = $(DESTDIR)#{CONFIG["prefix"]}
exec_prefix = $(DESTDIR)#{CONFIG["exec_prefix"]}
libdir = $(DESTDIR)#{$libdir}#{target_prefix}
diff --git a/ruby.1 b/ruby.1
index a6b6e1f..30126d4 100644
--- a/ruby.1
+++ b/ruby.1
@@ -279,7 +279,7 @@ The end of script must be specified with either EOF, ^D (control-D),
^Z (control-Z), or reserved word __END__.If the directory name is
specified, Ruby will switch to that directory before executing script.
.TP
-.B -X directory
+.B -C directory
causes Ruby to switch to the directory.
.TP
.B -y --yydebug
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ee3f72b..2cd964b 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -102,7 +102,7 @@ OBJS = array.obj \
all: miniruby$(EXEEXT) rbconfig.rb ext/extmk.rb \
$(LIBRUBY) $(MISCLIBS)
set LIB=../../win32;$(ORGLIBPATH)
- @.\miniruby$(EXEEXT) -Xext extmk.rb
+ @.\miniruby$(EXEEXT) -Cext extmk.rb
ruby: $(PROGRAM)
rubyw: $(WPROGRAM)
@@ -154,7 +154,7 @@ install: rbconfig.rb
clean:; @rm -f $(OBJS) $(LIBRUBY_A) $(MAINOBJ) rbconfig.rb
@rm -f ext/extinit.c ext/extinit.obj ext/vc*.pdb *.obj *.res
- @-.\miniruby$(EXEEXT) -Xext extmk.rb clean
+ @-.\miniruby$(EXEEXT) -Cext extmk.rb clean
distclean: clean
@rm -f Makefile ext/extmk.rb config.h