summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-10-23 22:18:52 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-10-23 22:19:04 +0900
commit185c5738211e16f289aa7448823f678348597bb5 (patch)
treeb8aa92a5e86a9a4b4445e95d7f2efad9c35865c7 /common.mk
parentcda8bc3657b58a5376e7bd7beec346505ebe5893 (diff)
Add INSTRUBY_OPTS to INSTRUBY_ARGS [ci skip]
For extra options from the `make` command line. Also add explicit `--install` option to install-nodoc.
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 05c807e3d2..debef394b8 100644
--- a/common.mk
+++ b/common.mk
@@ -186,7 +186,8 @@ INSTRUBY_ARGS = $(SCRIPT_ARGS) \
--data-mode=$(INSTALL_DATA_MODE) \
--prog-mode=$(INSTALL_PROG_MODE) \
--installed-list $(INSTALLED_LIST) \
- --mantype="$(MANTYPE)"
+ --mantype="$(MANTYPE)" \
+ $(INSTRUBY_OPTS)
INSTALL_PROG_MODE = 0755
INSTALL_DATA_MODE = 0644
@@ -384,7 +385,7 @@ post-install-all:: post-install-local post-install-ext post-install-gem post-ins
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
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
+ $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --exclude=doc
post-install-nodoc:: post-install-local post-install-ext post-install-gem
install-local: pre-install-local do-install-local post-install-local