From 0f7e05a0a275b93b17b50ea5a1f99a63048b2378 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 28 Nov 2011 15:14:14 +0000 Subject: [PATCH] * common.mk (INSTRUBY_ARGS): added --mantype to apply mdoc2man.rb to man pages. Fixes #5598. (do-install-nodoc, do-install-local, do-install-man, dont-install-nodoc, dont-install-local, dont-install-man): No longer needs --mantype. Reported by Rainer Orth , patch by George Koehler . git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++++++++ common.mk | 15 ++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bce2c747e2..9636716d25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Nov 29 00:08:57 2011 Yuki Sonoda (Yugui) + + * common.mk (INSTRUBY_ARGS): added --mantype to apply mdoc2man.rb + to man pages. Fixes #5598. + (do-install-nodoc, do-install-local, do-install-man, + dont-install-nodoc, dont-install-local, dont-install-man): + No longer needs --mantype. + + Reported by Rainer Orth , + patch by George Koehler . + Mon Nov 28 22:26:31 2011 NAKAMURA Usaku * test/rake/test_rake_directory_task.rb diff --git a/common.mk b/common.mk index ea244cca83..eb89a2befb 100644 --- a/common.mk +++ b/common.mk @@ -123,7 +123,8 @@ INSTRUBY = $(SUDO) $(MINIRUBY) $(srcdir)/tool/rbinstall.rb INSTRUBY_ARGS = $(SCRIPT_ARGS) \ --data-mode=$(INSTALL_DATA_MODE) \ --prog-mode=$(INSTALL_PROG_MODE) \ - --installed-list $(INSTALLED_LIST) + --installed-list $(INSTALLED_LIST) \ + --mantype="$(MANTYPE)" INSTALL_PROG_MODE = 0755 INSTALL_DATA_MODE = 0644 @@ -239,13 +240,13 @@ post-install-all:: post-install-local post-install-ext post-install-doc install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc pre-install-nodoc:: pre-install-local pre-install-ext do-install-nodoc: $(PREP) - $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)" + $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) post-install-nodoc:: post-install-local post-install-ext install-local: pre-install-local do-install-local post-install-local pre-install-local:: pre-install-bin pre-install-lib pre-install-man do-install-local: $(PREP) - $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)" + $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local post-install-local:: post-install-bin post-install-lib post-install-man install-ext: pre-install-ext do-install-ext post-install-ext @@ -297,7 +298,7 @@ post-install-ext-arch:: install-man: pre-install-man do-install-man post-install-man pre-install-man:: install-prereq do-install-man: $(PREP) - $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)" + $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man post-install-man:: @$(NULLCMD) @@ -322,14 +323,14 @@ 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 dont-install-nodoc: $(PREP) - $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)" + $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) post-no-install-nodoc:: post-no-install-local post-no-install-ext what-where-local: no-install-local no-install-local: pre-no-install-local dont-install-local post-no-install-local pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man dont-install-local: $(PREP) - $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)" + $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man what-where-ext: no-install-ext @@ -389,7 +390,7 @@ what-where-man: no-install-man no-install-man: pre-no-install-man dont-install-man post-no-install-man pre-no-install-man:: install-prereq dont-install-man: $(PREP) - $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)" + $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man post-no-install-man:: @$(NULLCMD)