diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-09-04 04:43:26 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-09-04 04:43:26 +0000 |
| commit | db1571b1b466d20f6a17c85ab062ad37eddb588c (patch) | |
| tree | 2821e456507d0411170a667cc21a3e76153c5784 | |
| parent | 5c3523de765b41584cfcebb8aebbaa6ac9433c35 (diff) | |
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | instruby.rb | 7 |
4 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Mon Sep 4 13:40:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp> + + * configure.in: renamed libruby.a to libruby.{cygwin,mingw32}.a + on cygwin and mingw32. + Fri Sep 1 10:36:45 2000 Yukihiro Matsumoto <matz@ruby-lang.org> * stable version 1.6.0 released. diff --git a/Makefile.in b/Makefile.in index 1d22174a12..a2901c2bdd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,6 +24,7 @@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ SOLIBS = @SOLIBS@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ +RUBY_SO_NAME=@RUBY_SO_NAME@ EXEEXT = @EXEEXT@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) diff --git a/configure.in b/configure.in index be54aa5091..285aa2199d 100644 --- a/configure.in +++ b/configure.in @@ -849,17 +849,18 @@ case "$target_os" in esac ;; cygwin*|mingw*) + RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'.$target_os if test x"$enable_shared" = xyes; then - LIBRUBY_SO='$(RUBY_INSTALL_NAME).'$target_os.dll + LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_DLDFLAGS='--dllname=$@ --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)' else LIBRUBY_SO=dummy - LIBRUBY_DLDFLAGS='--output-exp=$(RUBY_INSTALL_NAME).exp --dllname=$(RUBY_INSTALL_NAME)$(EXEEXT) --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)' + LIBRUBY_DLDFLAGS='--output-exp=$(RUBY_SO_NAME).exp --dllname=$(RUBY_SO_NAME)$(EXEEXT) --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)' fi LIBRUBY_ALIASES='' LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a' - LIBRUBY='lib$(RUBY_INSTALL_NAME).a' - LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)' + LIBRUBY='lib$(RUBY_SO_NAME).a' + LIBRUBYARG='-L. -l$(RUBY_SO_NAME)' FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in SOLIBS='$(LIBS)' case "$target_os" in diff --git a/instruby.rb b/instruby.rb index a8d164cd51..0e3dbbed03 100644 --- a/instruby.rb +++ b/instruby.rb @@ -32,6 +32,10 @@ wdir = Dir.getwd File.makedirs bindir, true File.install ruby_install_name+exeext, "#{bindir}/#{ruby_install_name}#{exeext}", 0755, true +rubyw = ruby_install_name.sub(/ruby/, '\&w')+exeext +if File.exist? rubyw + File.install rubyw, "#{bindir}/#{rubyw}", 0755, true +end for dll in Dir['*.dll'] File.install dll, "#{bindir}/#{dll}", 0755, true end @@ -86,9 +90,6 @@ end if RUBY_PLATFORM =~ /mswin32|mingw/ File.makedirs archlibdir + "/win32", true File.install "win32/win32.h", archlibdir + "/win32", 0644, true - if File.exist? wdir+'/'+CONFIG["LIBRUBY"] - File.install wdir+'/'+CONFIG["LIBRUBY"], archlibdir, 0644, true - end end File.install wdir+'/'+CONFIG['LIBRUBY_A'], archlibdir, 0644, true |