diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-09-19 07:01:54 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-09-19 07:01:54 +0000 |
| commit | 053140491c5594ee81064ef3dc19d32b3e907794 (patch) | |
| tree | 8f6f1ea256791efed870bc70fbe94401260fc01e | |
| parent | c74a3b21f59af9a59e42d42e4947beab3897e208 (diff) | |
| download | ruby-053140491c5594ee81064ef3dc19d32b3e907794.tar.gz | |
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | win32/setup.mak | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -4,7 +4,8 @@ Mon Sep 18 17:46:11 2000 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Sep 19 14:01:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp> - * configure.in: include version number in RUBY_SO_NAME. + * configure.in, win32/setup.mak: include version number + in RUBY_SO_NAME. Tue Sep 19 01:14:56 2000 Yukihiro Matsumoto <matz@ruby-lang.org> diff --git a/configure.in b/configure.in index 055f42229e..f0ed110889 100644 --- a/configure.in +++ b/configure.in @@ -849,7 +849,7 @@ case "$target_os" in esac ;; cygwin*|mingw*) - RUBY_SO_NAME=$target_os-'$(RUBY_INSTALL_NAME)'-${MAJOR}.${MINOR} + RUBY_SO_NAME=$target_os-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR} if test x"$enable_shared" = xyes; then LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_DLDFLAGS='--dllname=$@ --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)' diff --git a/win32/setup.mak b/win32/setup.mak index f933332997..6bca4419b1 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -18,7 +18,7 @@ Makefile: @echo ### makefile for ruby $(OS) ###> $@ @echo srcdir = $(srcdir:\=/)>> $@ @echo RUBY_INSTALL_NAME = ruby>> $@ - @echo RUBY_SO_NAME = $$(RUBY_INSTALL_NAME).$(OS)>> $@ + @echo RUBY_SO_NAME = $(OS)-$$(RUBY_INSTALL_NAME)16>> $@ @echo !INCLUDE $$(srcdir)/win32/Makefile.sub>> $@ config.h config.status: $(srcdir)/win32/$$@.in |