From patchwork Fri Oct 18 20:31:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 284720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8D7592C00DC for ; Sat, 19 Oct 2013 07:35:29 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 307ED8B9AA; Fri, 18 Oct 2013 20:35:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4i9IxEa2QHO0; Fri, 18 Oct 2013 20:35:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 68B178B93D; Fri, 18 Oct 2013 20:35:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 366BB1BFAA2 for ; Fri, 18 Oct 2013 20:34:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0523F8A3BD for ; Fri, 18 Oct 2013 20:34:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3LEQh2uVFftO for ; Fri, 18 Oct 2013 20:34:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3E9828C288 for ; Fri, 18 Oct 2013 20:34:44 +0000 (UTC) Received: by mail-wg0-f46.google.com with SMTP id m15so4219243wgh.13 for ; Fri, 18 Oct 2013 13:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=siIpdZfSH0CHtTgwCOuO8Av8bQWdt9tWLC7eaTAS0jU=; b=WyIJjoYYq26trvDjgpXFgFnxBTZ8Z1mjNjhOOIVqSCXAl7S2TZhP04J2DCDrurpafc Zl+Dqq0+SDxhnHYBo6no48ye8yPovDq5+jFFFKdOh86kkHKd5vAOP8Bvazp3opmqHDoW mDoS7s6oOji0cV3CJylAN36j59eJuz7/XeVSqp48OSyGwkG2ReUpXXvDGbafSqQPIFCU IJyhEcDYd/V5oW/p8TFZk3nZiSMJMaFBwkPGkRHFakLW3w8gGwa8QBBZwF37wQ3RKPOx haFI36JV/cgf39u6qltEsqhgPOmvb/AhytMCLFBzBMxWLsQjvacdNfiBXpHkJ3AERTHN fuFw== X-Received: by 10.194.170.133 with SMTP id am5mr3758912wjc.42.1382128482855; Fri, 18 Oct 2013 13:34:42 -0700 (PDT) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id q17sm6788939wiv.10.2013.10.18.13.34.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Oct 2013 13:34:42 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Fri, 18 Oct 2013 22:31:28 +0200 Message-Id: X-Mailer: git-send-email 1.8.4.1 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 04/12] manual: move the manual rsync directory under $(O)/build/ X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This patch just moves the manual source/build directory in $(O)/build/ (currently this location is $(O)/docs/manual/.build/, which is removed at this end of the manual generation). This location is used to: - generate the package list files - rsync the *.txt source from docs/manual/ The output manuals are still generated in $(O)/docs/manual/, so the release target is unchanged. Moving the manual source/build directory is more consistent with the rest of how Buildroot works. This also avoid to remove the *.txt that are generated and are actually used by a2x, this is very helpful for investigating asdciidoc/dblatex/texlive related issues. Signed-off-by: Samuel Martin --- Changes v1 -> v2: - rebase on top of ThomasDS' patches - split patch content - detail a bit more the commit message Signed-off-by: Samuel Martin --- docs/manual/manual.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index aeafd10..ffc4e9a 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -1,6 +1,8 @@ +MANUAL_BUILDDIR = $(BUILD_DIR)/buildroot-manual manual-update-lists: manual-check-dependencies-lists $(Q)$(call MESSAGE,"Updating the manual lists...") - $(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(O)/docs/manual/.build \ + $(Q)mkdir -p $(MANUAL_BUILDDIR) + $(Q)BR2_DEFCONFIG="" TOPDIR=$(TOPDIR) O=$(MANUAL_BUILDDIR) \ $(TOPDIR)/support/scripts/gen-manual-lists.py # we can't use suitable-host-package here because that's not available in @@ -56,11 +58,10 @@ $$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt \ manual-check-dependencies-$(3) \ manual-update-lists $(Q)$(call MESSAGE,"Generating $(5) $(1)...") - $(Q)mkdir -p $$(@D)/.build - $(Q)rsync -au docs/$(1)/*.txt $$(@D)/.build + $(Q)mkdir -p $$(@D) $(MANUAL_BUILDDIR) + $(Q)rsync -au docs/$(1)/*.txt $(MANUAL_BUILDDIR) $(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \ - -D $$(@D) $$(@D)/.build/$(1).txt - -$(Q)rm -rf $$(@D)/.build + -D $$(@D) $(MANUAL_BUILDDIR)/$(1).txt endef ################################################################################ @@ -79,7 +80,7 @@ $(call GENDOC_INNER,$(1),text,text,text,text) $(call GENDOC_INNER,$(1),epub,epub,epub,ePUB) clean: $(1)-clean $(1)-clean: - $(Q)$(RM) -rf $(O)/docs/$(1) + $(Q)$(RM) -rf $(O)/docs/$(1) $(MANUAL_BUILDDIR) .PHONY: $(1) $(1)-clean manual-update-lists endef