diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index a4a01ddefb..a5b3006533 100644 --- a/configure.in +++ b/configure.in @@ -3705,7 +3705,7 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_RELATIVE=yes fi LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)' - LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)' + LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR)' LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(RUBY_PROGRAM_VERSION)' if test "$visibility_option" = ld; then LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*' @@ -3924,7 +3924,7 @@ AS_CASE(["$target_os"], fi ], [cygwin*|mingw*], [ - RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)' + RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0' LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' AS_CASE(["$target_os"], [cygwin*], [ diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 14ffd1db85..d5502382fb 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -100,7 +100,7 @@ clean-local:: @$(RM) $(RUBYDEF) ifeq (@target_os@,cygwin) -cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF) +cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)0.dll: $(LIBRUBY_A) $(RUBYDEF) $(ECHO) generating $@ $(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@ endif diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 60f2e23b2d..85093a7c00 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -135,11 +135,11 @@ PLATFORM_DIR = win32 arch = $(ARCH)-$(PLATFORM) sitearch = $(ARCH)-$(RT) !if !defined(ruby_version) -ruby_version = $(MAJOR).$(MINOR).$(TEENY) +ruby_version = $(MAJOR).$(MINOR).0 !endif !ifndef RUBY_SO_NAME -RUBY_SO_NAME = $(RT)-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)$(TEENY) +RUBY_SO_NAME = $(RT)-$(RUBY_BASE_NAME)$(ruby_version:.=) !if "$(ARCH)" != "i386" RUBY_SO_NAME = $(ARCH)-$(RUBY_SO_NAME) !endif |