mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in, common.mk, */configure.bat (rdoc): make before
install if rdoc is enabled. [ruby-dev:39325] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d937bbe9ce
commit
3ab03a234d
4 changed files with 13 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
Mon Sep 14 11:23:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in, common.mk, */configure.bat (rdoc): make before
|
||||
install if rdoc is enabled. [ruby-dev:39325]
|
||||
|
||||
Mon Sep 14 10:56:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* common.mk (check-ruby): run all test of ruby itself.
|
||||
|
|
|
@ -124,7 +124,7 @@ BOOTSTRAPRUBY = $(BASERUBY)
|
|||
|
||||
COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -rrbconfig $(srcdir)/tool/compile_prelude.rb
|
||||
|
||||
all: encs exts main
|
||||
all: encs exts main $(RDOCTARGET)
|
||||
|
||||
main: exts
|
||||
@$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
|
||||
|
@ -172,7 +172,7 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
|
|||
ruby.imp: $(EXPORTOBJS)
|
||||
@$(NM) -Pgp $(EXPORTOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
|
||||
|
||||
install: install-nodoc $(RDOCTARGET)
|
||||
install: install-nodoc install-$(RDOCTARGET)
|
||||
install-all: install-nodoc install-doc install-capi
|
||||
|
||||
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
|
||||
|
@ -337,6 +337,7 @@ post-install-doc::
|
|||
rdoc: $(PROGRAM) PHONY
|
||||
@echo Generating RDoc documentation
|
||||
$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
|
||||
nodoc: PHONY
|
||||
|
||||
what-where-doc: no-install-doc
|
||||
no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
|
||||
|
|
|
@ -2120,7 +2120,9 @@ AC_ARG_ENABLE(install-doc,
|
|||
AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]),
|
||||
[install_doc=$enableval], [install_doc=yes])
|
||||
if test "$install_doc" != no; then
|
||||
RDOCTARGET="install-doc"
|
||||
RDOCTARGET="rdoc"
|
||||
else
|
||||
RDOCTARGET="nodoc"
|
||||
fi
|
||||
AC_SUBST(RDOCTARGET)
|
||||
|
||||
|
|
|
@ -88,12 +88,12 @@ goto :loop
|
|||
shift
|
||||
goto :loop
|
||||
:enable-rdoc
|
||||
echo>> ~tmp~.mak "RDOCTARGET=install-doc" \
|
||||
echo>> ~tmp~.mak "RDOCTARGET=rdoc" \
|
||||
echo>>confargs.tmp %1 \
|
||||
shift
|
||||
goto :loop
|
||||
:disable-rdoc
|
||||
echo>> ~tmp~.mak "RDOCTARGET=install-nodoc" \
|
||||
echo>> ~tmp~.mak "RDOCTARGET=nodoc" \
|
||||
echo>>confargs.tmp %1 \
|
||||
shift
|
||||
goto :loop
|
||||
|
|
Loading…
Reference in a new issue