From e8454ae7765c245432758b53345ea2601a84cbfe Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 21 Sep 2006 13:58:33 +0000
Subject: * 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/trunk@10985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'common.mk')

diff --git a/common.mk b/common.mk
index a96578be82..f6b58b338d 100644
--- a/common.mk
+++ b/common.mk
@@ -153,7 +153,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
 
@@ -228,17 +228,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)
-- 
cgit v1.2.3