summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--bcc32/Makefile.sub4
-rw-r--r--dir.c2
-rw-r--r--win32/Makefile.sub2
-rw-r--r--wince/Makefile.sub2
5 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 03ed0ba..ab616d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 11 12:09:05 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * {bcc32,win32,wince}/Makefile.sub: ri data was not installed
+ into correct path. [ruby-dev:26011]
+
+ * bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
+
Sun Apr 10 10:12:42 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 78e1309..1fc6b2d 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -94,7 +94,7 @@ exec_prefix = $(prefix)
libdir = $(exec_prefix)/lib
!endif
!if !defined(datadir)
-datadir = $(prefix)/share
+datadir = /share
!endif
!ifndef EXTOUT
EXTOUT = .ext
@@ -109,7 +109,7 @@ TESTUI = console
TESTS =
!endif
!ifndef RDOCTARGET
-RDOCTARGET = install-doc
+RDOCTARGET = install-nodoc
!endif
OUTFLAG = -o
diff --git a/dir.c b/dir.c
index 25748ed..30ec182 100644
--- a/dir.c
+++ b/dir.c
@@ -1276,7 +1276,7 @@ dir_s_aref(obj, str)
/*
* call-seq:
* Dir.glob( string, [flags] ) => array
- * Dir.glob( string, [flags] ) {| filename | block } => false
+ * Dir.glob( string, [flags] ) {| filename | block } => nil
*
* Returns the filenames found by expanding the pattern given in
* <i>string</i>, either as an <i>array</i> or as parameters to the
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 8e0144c..3af99a1 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -88,7 +88,7 @@ exec_prefix = $(prefix)
libdir = $(exec_prefix)/lib
!endif
!if !defined(datadir)
-datadir = $(prefix)/share
+datadir = /share
!endif
!ifndef EXTOUT
EXTOUT = .ext
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 5306f5a..823f422 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -91,7 +91,7 @@ exec_prefix = $(prefix)
libdir = $(exec_prefix)/lib
!endif
!if !defined(datadir)
-datadir = $(prefix)/share
+datadir = /share
!endif
!ifndef EXTOUT
EXTOUT = .ext