* instruby.rb: remove junk args.

* lib/mkmf.rb (create_makefile): remove a trouble library
  before making a shared library.
* win32/Makefile.sub: invoke instruby.rb with the --make-flags option.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2002-12-28 10:32:05 +00:00
parent 025723b978
commit 2672d0cc28
4 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,12 @@
Sat Dec 28 19:21:24 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* instruby.rb: remove junk args.
* lib/mkmf.rb (create_makefile): remove a trouble library
before making a shared library.
* win32/Makefile.sub: invoke instruby.rb with the --make-flags option.
Sat Dec 28 03:09:58 2002 Wakou Aoyama <wakou@ruby-lang.org>
* lib/cgi.rb (CGI#[]): improvement. thanks to Kazuhiro NISHIYAMA

View File

@ -15,6 +15,7 @@ $dryrun = $OPT["n"]
Shellwords.shellwords($OPT["make-flags"] || "").grep(/^-[^-]*n/) do
break $dryrun = true
end
ARGV.delete_if{|x|x[0] == ?-}
destdir = ARGV[0] || ''
include FileUtils::Verbose

View File

@ -746,6 +746,7 @@ all: #{target ? "$(DLLIB)" : "Makefile"}
mfile.print "$(DLLIB): $(OBJS)\n\t"
mfile.print "@-$(RM) $@\n\t"
mfile.print "@-$(RM) $(TARGET).lib\n\t" if $mswin
if $static
mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$(DLLIB) $(OBJS)"
if ranlib = config_string('RANLIB')

View File

@ -407,7 +407,7 @@ $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT)
$(AR) $(ARFLAGS)$@ -def:$<
install: rbconfig.rb
$(MINIRUBY) $(srcdir)/instruby.rb -$(MFLAGS)$(MAKEFLAGS) $(DESTDIR)
$(MINIRUBY) $(srcdir)/instruby.rb --make-flags "-$(MFLAGS)$(MAKEFLAGS)" $(DESTDIR)
$(MINIRUBY) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install
clean: clean-ext clean-local