From 469970f7eaef6a062a91da012024badfa4535ec8 Mon Sep 17 00:00:00 2001
From: ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 Apr 2005 03:20:17 +0000
Subject: * {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]

* dir.c: rdoc fix.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 7 +++++++
 bcc32/Makefile.sub | 4 ++--
 dir.c              | 2 +-
 win32/Makefile.sub | 2 +-
 wince/Makefile.sub | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03ed0ba6a..ab616d77d 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 78e130965..1fc6b2dd9 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 25748ed4e..30ec1822e 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 8e0144c66..3af99a14e 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 5306f5afe..823f422e1 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
-- 
cgit