summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-21 13:58:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-21 13:58:33 +0000
commit816410dd1cf078a1aceb7b1e81c2f13a5a7ac9e0 (patch)
tree86a612f00d7055acb16a67cfaa128a592beba5b6 /common.mk
parente44f1a5a50565fafc45fec1184e5018ce6dfc357 (diff)
* common.mk (no-install): not install rdoc actually.
* common.mk (install-doc, no-install-doc): use instruby.rb. * instruby.rb: rdoc installation. * ext/extmk.rb: expand ruby executable names. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk16
1 files changed, 10 insertions, 6 deletions
diff --git a/common.mk b/common.mk
index dd8813b..e379ad5 100644
--- a/common.mk
+++ b/common.mk
@@ -144,7 +144,7 @@ do-install-man:
post-install-man::
what-where: no-install
-no-install: no-install-nodoc $(RDOCTARGET)
+no-install: no-install-nodoc no-install-doc
what-where-all: no-install-all
no-install-all: no-install-nodoc
@@ -219,17 +219,21 @@ dont-install-man:
post-no-install-man::
install-doc: rdoc pre-install-doc do-install-doc post-install-doc
+pre-install-doc:: install-prereq
do-install-doc: $(PROGRAM)
- $(RUNRUBY) -run -e cp -- -p -r -v "$(RDOCOUT)" "$(RIDATADIR)"
+ $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+post-install-doc::
rdoc: $(PROGRAM) PHONY
@echo Generating RDoc documentation
$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
-pre-install-doc:: PHONY
- $(RUNRUBY) -run -e mkdir -- -p "$(RIDATADIR)"
-
-post-install-doc:: PHONY
+what-where-doc: no-install-doc
+no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
+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::
install-prereq:
@exit > $(INSTALLED_LIST)