diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-30 10:16:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-30 10:16:53 +0000 |
| commit | e18f8ffd7b91edcab7fdd81703bd9201fb75bfff (patch) | |
| tree | 0426b7cbae13dc413203200a97f253cd59c645c2 /bcc32 | |
| parent | f8292491b30fa0150740519d05465ac0a717b7be (diff) | |
| download | ruby-e18f8ffd7b91edcab7fdd81703bd9201fb75bfff.tar.gz ruby-e18f8ffd7b91edcab7fdd81703bd9201fb75bfff.tar.xz ruby-e18f8ffd7b91edcab7fdd81703bd9201fb75bfff.zip | |
* ext/extmk.rb: split --make argument contains options, assume
the first word of --make-flags is always options even unless
preceeded by -, and ignore letter-case of options if nmake.
* instruby.rb: extract -n option also from --make and
--make-flags.
* bcc32/Makefile.sub, win32/Makefile.sub: not prepend - to
$(MFLAGS)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32')
| -rw-r--r-- | bcc32/Makefile.sub | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 0640a7ff7..b7ffb1150 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -184,7 +184,7 @@ OBJS = array.obj \ all: miniruby$(EXEEXT) rbconfig.rb \ $(LIBRUBY) $(MISCLIBS) - @.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb --extstatic=$(EXTSTATIC) --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" + @.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb --extstatic=$(EXTSTATIC) --make "$(MAKE)" --make-flags "$(MFLAGS)$(MAKEFLAGS)" ruby: $(PROGRAM) rubyw: $(WPROGRAM) @@ -407,8 +407,8 @@ $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT) $(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A) install: rbconfig.rb - $(MINIRUBY) $(srcdir)instruby.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" $(DESTDIR) - $(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install + $(MINIRUBY) $(srcdir)instruby.rb --make "$(MAKE)" --make-flags "$(MFLAGS)$(MAKEFLAGS)" $(DESTDIR) + $(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install clean: clean-ext clean-local @@ -425,7 +425,7 @@ clean-local: @if exist *.il? del *.il? clean-ext: - @-$(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" clean + @-$(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "$(MFLAGS)$(MAKEFLAGS)" clean distclean: distclean-ext distclean-local @@ -459,7 +459,7 @@ distclean-local: clean-local @if exist miniruby$(EXEEXT) del miniruby$(EXEEXT) distclean-ext: - @-$(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" distclean + @-$(MINIRUBY) $(srcdir)ext/extmk.rb --make "$(MAKE)" --make-flags "$(MFLAGS)$(MAKEFLAGS)" distclean realclean: distclean @if exist parse.c del parse.c |