diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-08 14:58:57 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-08 14:58:57 +0000 |
| commit | 738d80a805317fd79e732cdcb13eeb148fa64819 (patch) | |
| tree | efa421a1c26f8561de4ba0b2ae9374ca4c86672d | |
| parent | cc8ee0ad14c9dc3100229c7a238debae8f42445f (diff) | |
* configure.in (RDOCTARGET): new macro. if you want to install
rdoc documentation, you need to run configure with
--enable-install-doc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | configure.in | 10 |
3 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Thu Jan 8 23:49:21 2004 WATANABE Hirofumi <eban@ruby-lang.org> + + * configure.in (RDOCTARGET): new macro. if you want to install + rdoc documentation, you need to run configure with + --enable-install-doc. + Thu Jan 8 21:29:43 2004 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns diff --git a/Makefile.in b/Makefile.in index 6e8cd18b42..bbfe6f8186 100644 --- a/Makefile.in +++ b/Makefile.in @@ -139,7 +139,7 @@ ruby.imp: $(LIBRUBY_A) @@NM@ -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ # $(MINIRUBY) $< $@ -install: install-nodoc rdoc +install: install-nodoc @RDOCTARGET@ install-nodoc: rbconfig.rb $(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --mantype="$(MANTYPE)" @@ -149,9 +149,9 @@ what-where no-install: rbconfig.rb $(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) --mantype="$(MANTYPE)" $(MINIRUBY) $(srcdir)/ext/extmk.rb -n $(SCRIPT_ARGS) install -rdoc: +install-doc: @echo Generating RDoc documentation - $(MINIRUBY) -I lib bin/rdoc --all --ri-system + $(bindir)/$(PROGRAM) $(srcdir)/bin/rdoc --all --ri-system $(srcdir) clean-ext: @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) clean 2> /dev/null || true @@ -204,7 +204,7 @@ Makefile: $(srcdir)/Makefile.in .PRECIOUS: @MAKEFILES@ -.PHONY: test install install-nodoc rdoc +.PHONY: test install install-nodoc install-doc PHONY: diff --git a/configure.in b/configure.in index c51fd57b15..3c07c4e402 100644 --- a/configure.in +++ b/configure.in @@ -1223,6 +1223,16 @@ fi XLDFLAGS="$XLDFLAGS -L." AC_SUBST(ARCHFILE) +dnl build rdoc index if requested +RDOCTARGET="" +AC_ARG_ENABLE(install-doc, + [ --enable-install-doc build and install rdoc indexes during install ], + [install_doc=$enableval], [install_doc=no]) +if test "$install_doc" != no; then + RDOCTARGET="install-doc" +fi +AC_SUBST(RDOCTARGET) + case "$target_os" in netbsd*) CFLAGS="$CFLAGS -pipe" |