diff options
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index ccfb2ded2b..259f1fba2e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -272,9 +272,9 @@ $(LIBRUBY_SO): -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)ruby_static_id_*' \ -L '$(SYMBOL_PREFIX)*_threadptr_*' -L '$(SYMBOL_PREFIX)*_ec_*' $@ $(Q) $(POSTLINK) - @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link rescue nil; \ - File.symlink "$(LIBRUBY_SO)", link}' \ - $(LIBRUBY_ALIASES) || true + @-$(MINIRUBY) -e 'so, *aliases = ARGV; aliases.uniq!; aliases.delete(File.basename(so)); \ + aliases.each { |link| File.delete link rescue nil; File.symlink so, link }' \ + $(LIBRUBY_SO) $(LIBRUBY_ALIASES) || true LIBRUBY_WITH_EXT = @LIBRUBY_WITH_EXT@ $(LIBRUBY_$(LIBRUBY_WITH_EXT)): $(LIBRUBY_SO_UPDATE) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 5a55b39add..194396321e 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -360,7 +360,7 @@ install?(:local, :arch, :lib, :'lib-arch') do install lib, libdir, :mode => $prog_mode, :strip => $strip unless lib == arc install arc, libdir, :mode => $data_mode unless CONFIG["INSTALL_STATIC_LIBRARY"] == "no" if dll == lib and dll != arc - for link in CONFIG["LIBRUBY_ALIASES"].split + for link in CONFIG["LIBRUBY_ALIASES"].split - [File.basename(dll)] ln_sf(dll, File.join(libdir, link)) end end |