summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-05-21 12:23:51 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-05-21 12:23:51 +0000
commit189372842d6f76605541b7c65b99745b12765a23 (patch)
tree9648aba94c2928d08dfd400d594988679adcec4e
parentb069230a3a395ee57a9874bb6667bb704c09f2a8 (diff)
see ChangeLog.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--configure.in3
-rw-r--r--ext/Setup.dj1
-rw-r--r--instruby.rb2
4 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 23fb0e62c3e..276277ece00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun May 21 21:17:00 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * configure.in: add Setup.dj for djgpp cross-compiling.
+
+ * Setup.dj: add readline.
+
+ * instruby.rb: copy win32/win32.h to archlibdir on mingw32.
+
Sun May 21 17:31:37 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* instruby.rb: support "make install" for cross-compiling.
diff --git a/configure.in b/configure.in
index c93cb4b7bc4..4345e2b3a99 100644
--- a/configure.in
+++ b/configure.in
@@ -672,6 +672,9 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no
LIBOBJS="$LIBOBJS os2.$OBJEXT"
setup=Setup.emx
;;
+ *djgpp*)
+ setup=Setup.dj
+ ;;
*)
setup=Setup
;;
diff --git a/ext/Setup.dj b/ext/Setup.dj
index cf25c07e6bf..6c955cba1ec 100644
--- a/ext/Setup.dj
+++ b/ext/Setup.dj
@@ -9,6 +9,7 @@ fcntl
nkf
marshal
md5
+readline
sdbm
#socket
#tkutil
diff --git a/instruby.rb b/instruby.rb
index da773c08257..ce13ebffe84 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -83,7 +83,7 @@ end
for f in Dir["*.h"]
File.install f, archlibdir, 0644, true
end
-if RUBY_PLATFORM =~ /mswin32/
+if RUBY_PLATFORM =~ /mswin32|mingw/
File.makedirs archlibdir + "/win32", true
File.install "win32/win32.h", archlibdir + "/win32", 0644, true
if File.exist? wdir+'/rubymw.lib'