From e4e82e50abc795876b8eba99517c8209fdf1f2d7 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 7 Mar 2013 01:39:10 +0000 Subject: [PATCH] common.mk: reinstall target * common.mk (reinstall): new target. * defs/gmake.mk (install, uninstall): can't run parallel. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 2 ++ defs/gmake.mk | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/common.mk b/common.mk index 28b6e5b31c..df6ab53935 100644 --- a/common.mk +++ b/common.mk @@ -326,6 +326,8 @@ post-no-install-all:: post-no-install-local post-no-install-ext post-no-install- uninstall: $(INSTALLED_LIST) $(Q)$(SUDO) $(MINIRUBY) $(srcdir)/tool/rbuninstall.rb --destdir=$(DESTDIR) $(INSTALLED_LIST) +reinstall: uninstall install + what-where-nodoc: no-install-nodoc no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext diff --git a/defs/gmake.mk b/defs/gmake.mk index 67dce0b514..4e38f38559 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -15,3 +15,12 @@ yes-test-all yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARG endif $(TEST_TARGETS): $(TEST_DEPENDS) + +ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),) +install-targets := $(filter install uninstall,$(MAKECMDGOALS)) +$(word 1,$(install-targets)): $(word 0,$(install-targets)) +endif + +ifneq ($(filter reinstall,$(MAKECMDGOALS)),) +install: uninstall +endif