diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 12 | ||||
| -rw-r--r-- | common.mk | 13 |
3 files changed, 26 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Fri Oct 20 08:42:38 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (NULLCMD): dummy command. + + * bcc32/Makefile.sub (post-install-*): Borland make cannot ignore + command-less double-colon rules. [ruby-dev:29676] + Fri Oct 20 00:37:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index e01573e8f5..0c2fe7cdf6 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -436,17 +436,17 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb . $(icondirs) $(srcdir)win32 post-install-bin:: - @exit > $@ + @$(NULLCMD) post-install-lib:: - @exit > $@ + @$(NULLCMD) post-install-ext-comm:: - @exit > $@ + @$(NULLCMD) post-install-ext-arch:: - @exit > $@ + @$(NULLCMD) post-install-man:: - @exit > $@ + @$(NULLCMD) post-install-doc:: - @exit > $@ + @$(NULLCMD) clean-local:: @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib @@ -3,6 +3,7 @@ lib: $(LIBRUBY) dll: $(LIBRUBY_SO) RUBYOPT = +NULLCMD = STATIC_RUBY = static-ruby @@ -128,30 +129,35 @@ pre-install-bin:: install-prereq do-install-bin: $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin post-install-bin:: + @$(NULLCMD) install-lib: pre-install-lib do-install-lib post-install-lib pre-install-lib:: install-prereq do-install-lib: $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib post-install-lib:: + @$(NULLCMD) install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm pre-install-ext-comm:: install-prereq do-install-ext-comm: $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-comm post-install-ext-comm:: + @$(NULLCMD) install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch pre-install-ext-arch:: install-prereq do-install-ext-arch: $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-arch post-install-ext-arch:: + @$(NULLCMD) install-man: pre-install-man do-install-man post-install-man pre-install-man:: install-prereq do-install-man: $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)" post-install-man:: + @$(NULLCMD) what-where: no-install no-install: no-install-nodoc no-install-doc @@ -199,6 +205,7 @@ pre-no-install-bin:: install-prereq dont-install-bin: $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin post-no-install-bin:: + @$(NULLCMD) what-where-lib: no-install-lib no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib @@ -206,6 +213,7 @@ pre-no-install-lib:: install-prereq dont-install-lib: $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib post-no-install-lib:: + @$(NULLCMD) what-where-ext-comm: no-install-ext-comm no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm @@ -213,6 +221,7 @@ pre-no-install-ext-comm:: install-prereq dont-install-ext-comm: $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-comm post-no-install-ext-comm:: + @$(NULLCMD) what-where-ext-arch: no-install-ext-arch no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch @@ -220,6 +229,7 @@ pre-no-install-ext-arch:: install-prereq dont-install-ext-arch: $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-arch post-no-install-ext-arch:: + @$(NULLCMD) what-where-man: no-install-man no-install-man: pre-no-install-man dont-install-man post-no-install-man @@ -227,12 +237,14 @@ pre-no-install-man:: install-prereq dont-install-man: $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)" post-no-install-man:: + @$(NULLCMD) install-doc: rdoc pre-install-doc do-install-doc post-install-doc pre-install-doc:: install-prereq do-install-doc: $(PROGRAM) $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)" post-install-doc:: + @$(NULLCMD) rdoc: $(PROGRAM) PHONY @echo Generating RDoc documentation @@ -244,6 +256,7 @@ pre-no-install-doc:: install-prereq dont-install-doc:: $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)" post-no-install-doc:: + @$(NULLCMD) install-prereq: @exit > $(INSTALLED_LIST) |