summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2020-03-08 10:21:18 +0100
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-03-14 18:16:47 +0900
commit459670d47f8528db8f5d4f28aeac191b1af66d81 (patch)
tree9b90f6a92ae8b9524ed39e9e2430c7352a9cb4f5
parent956e220ae280bbd3426bfb2bb80edb6e69ad3f98 (diff)
Fix bundled gems installation on a fresh clone
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/2951
-rw-r--r--README.md7
-rw-r--r--common.mk10
2 files changed, 6 insertions, 11 deletions
diff --git a/README.md b/README.md
index 378f48f8d7..f06bf1d3ea 100644
--- a/README.md
+++ b/README.md
@@ -108,12 +108,7 @@ in the mail body (not subject) to the address
interpreter works well. If you see the message "`check succeeded`", your
Ruby works as it should (hopefully).
-8. Optionally, run `make update-gems` and `make extract-gems`.
-
- If you want to install bundled gems, run `make update-gems` and
- `make extract-gems` before running `make install`.
-
-9. Run '`make install`'.
+8. Run '`make install`'.
This command will create the following directories and install files into
them.
diff --git a/common.mk b/common.mk
index e8f351116a..8814e1490a 100644
--- a/common.mk
+++ b/common.mk
@@ -367,17 +367,17 @@ pkgconfig-data: $(ruby_pc)
$(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
install-all: docs pre-install-all do-install-all post-install-all
-pre-install-all:: all pre-install-local pre-install-ext pre-install-doc
+pre-install-all:: all pre-install-local pre-install-ext pre-install-gem pre-install-doc
do-install-all: pre-install-all
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) $(INSTALL_DOC_OPTS)
-post-install-all:: post-install-local post-install-ext post-install-doc
+post-install-all:: post-install-local post-install-ext post-install-gem post-install-doc
@$(NULLCMD)
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
-pre-install-nodoc:: pre-install-local pre-install-ext
+pre-install-nodoc:: pre-install-local pre-install-ext pre-install-gem
do-install-nodoc: main pre-install-nodoc
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --exclude=doc
-post-install-nodoc:: post-install-local post-install-ext
+post-install-nodoc:: post-install-local post-install-ext post-install-gem
install-local: pre-install-local do-install-local post-install-local
pre-install-local:: pre-install-bin pre-install-lib pre-install-man
@@ -543,7 +543,7 @@ post-install-doc::
@$(NULLCMD)
install-gem: pre-install-gem do-install-gem post-install-gem
-pre-install-gem:: pre-install-bin pre-install-lib pre-install-man
+pre-install-gem:: prepare-gems pre-install-bin pre-install-lib pre-install-man
do-install-gem: $(PROGRAM) pre-install-gem
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=gem
post-install-gem::