summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 23fb0e62c3..276277ece0 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 c93cb4b7bc..4345e2b3a9 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 cf25c07e6b..6c955cba1e 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 da773c0825..ce13ebffe8 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'