From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752073AbcGAM1M (ORCPT ); Fri, 1 Jul 2016 08:27:12 -0400 Received: from mga11.intel.com ([192.55.52.93]:17753 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbcGAM1L (ORCPT ); Fri, 1 Jul 2016 08:27:11 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,556,1459839600"; d="scan'208";a="1013464495" From: Jani Nikula To: Markus Heiser Cc: Jani Nikula , Mauro Carvalho Chehab , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, hverkuil@xs4all.nl, daniel.vetter@ffwll.ch, airlied@gmail.com, grant.likely@secretlab.ca, rdunlap@infradead.org, keithp@keithp.com Subject: [docs-next PATCH] Documentation/sphinx: skip build if user requested specific DOCBOOKS Date: Fri, 1 Jul 2016 15:24:44 +0300 Message-Id: <1467375884-10245-1-git-send-email-jani.nikula@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1467374614-3747-1-git-send-email-jani.nikula@intel.com> References: <1467374614-3747-1-git-send-email-jani.nikula@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the user requested specific DocBooks to be built using 'make DOCBOOKS=foo.xml htmldocs', assume no Sphinx build is desired. This check is transitional, and can be removed once we drop the DocBook build. Cc: Markus Heiser Cc: Mauro Carvalho Chehab Fixes: 22cba31bae9d ("Documentation/sphinx: add basic working Sphinx configuration and build") Signed-off-by: Jani Nikula --- Documentation/Makefile.sphinx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx index 6c203745b6c6..d8d13c92a178 100644 --- a/Documentation/Makefile.sphinx +++ b/Documentation/Makefile.sphinx @@ -17,6 +17,12 @@ ifeq ($(HAVE_SPHINX),0) $(warning The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed and in PATH, or set the SPHINXBUILD make variable to point to the full path of the '$(SPHINXBUILD)' executable.) @echo " SKIP Sphinx $@ target." +else ifneq ($(DOCBOOKS),) + +# Skip Sphinx build if the user explicitly requested DOCBOOKS. +.DEFAULT: + @echo " SKIP Sphinx $@ target (DOCBOOKS specified)." + else # HAVE_SPHINX # User-friendly check for rst2pdf -- 2.1.4