From patchwork Fri May 21 22:29:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12274003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F3E2C04FF3 for ; Fri, 21 May 2021 22:29:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 72D4A61176 for ; Fri, 21 May 2021 22:29:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230048AbhEUWbL (ORCPT ); Fri, 21 May 2021 18:31:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229634AbhEUWbJ (ORCPT ); Fri, 21 May 2021 18:31:09 -0400 Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DFF9C061574 for ; Fri, 21 May 2021 15:29:45 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id r26-20020a056830121ab02902a5ff1c9b81so19411707otp.11 for ; Fri, 21 May 2021 15:29:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vzi5E1pnutPnbX/jB18hiQvx2Ay2ZOUs5JyfprDkkfw=; b=uQtVoJw0evS/1L2LPixSLmpjEOjgTpT0jFvYpv0dG102P+1YbF87UX/dBVCwa6dIht ISCwTAheGp9NFYXtW2xsyKo9Nn2gXA0RMIj5GWzOEoj+oWx5uJXLODzWb5UHRoQnMZ7M 7ex4efbyxXPZqY5X5BOmvx7mxG9OdMj1zOANFZ2NrpP40xRWKNuxCzUSJhxtDzWtyyzM gcDAxKjQ3FBPwfQyIe65j0akSPRCO4R43sdM46VvgdG346LoaIxDgQtvoM+a1YzR6u0j kzM5yQN0XURouRTG8zlAwnwG6000oXu7pmuclFc1XRqsHywsqpBzk6SB7Pfs86pCmue8 UHkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vzi5E1pnutPnbX/jB18hiQvx2Ay2ZOUs5JyfprDkkfw=; b=nUlh+mtYotm3p0yH0FRrPGaecWxJ1K+UrMmjtn+57HWE7VG7ch8Pq74mM8Tv+XrEPS JmY9l6sXh1RnEi5oar7hDl/MfsteNz0hf0KzbfrL1GVHRSdLRqdD0WABziACkySiw7v2 r0VDijOQjGFwVdEndhuP66VnWDxrxvGVeC7nxGzV1fwvdTO7B+/Db6si7kLMhTeD8S0z 7RLHUlbrXuL+uioSzkMDu8PnKWjJ8V7Fx+rJRuNP8RWnmX93YoFISEUGUBmTOLcDNrk6 qvSbxjI1wNUwxXzOHaTDuSH6g4D9V5MGTNxtHB9OK0uKvTjxGJrn9uPJ/gqzJbSC6rlb SIWA== X-Gm-Message-State: AOAM530Y5ZTd87q6vRneOw2UXYyOKh6umeEX0LyHtJW88xAZmYtdC5xJ JkgXalE1RDG/0WTJfdQSBAyTGI1bNVoJ4g== X-Google-Smtp-Source: ABdhPJxZACMZgxKHg2co+Bz/6Bxi2CkoKcShtfuk21AsxmF3urhwWhuMf2OQrig2o4k03sNwmCGe7Q== X-Received: by 2002:a05:6830:140c:: with SMTP id v12mr10187715otp.310.1621636184492; Fri, 21 May 2021 15:29:44 -0700 (PDT) Received: from localhost (fixed-187-189-187-231.totalplay.net. [187.189.187.231]) by smtp.gmail.com with ESMTPSA id 73sm1039974oty.40.2021.05.21.15.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 15:29:44 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v3 1/5] doc: refactor common asciidoc dependencies Date: Fri, 21 May 2021 17:29:37 -0500 Message-Id: <20210521222941.525901-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210521222941.525901-1-felipe.contreras@gmail.com> References: <20210521222941.525901-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- Documentation/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 2aae4c9cbb..46d9b98dac 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -139,6 +139,7 @@ ASCIIDOC_CONF = -f asciidoc.conf ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ -amanversion=$(GIT_VERSION) \ -amanmanual='Git Manual' -amansource='Git' +ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -354,12 +355,12 @@ clean: $(RM) manpage-base-url.xsl $(RM) GIT-ASCIIDOCFLAGS -$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_HTML) -d manpage -o $@+ $< && \ mv $@+ $@ -$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_HTML) -o $@+ $< && \ mv $@+ $@ @@ -371,7 +372,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_XMLTO)$(RM) $@ && \ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< -%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +%.xml : %.txt $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_XML) -d manpage -o $@+ $< && \ mv $@+ $@ From patchwork Fri May 21 22:29:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12274005 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CE81C4707E for ; Fri, 21 May 2021 22:29:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EFC2A61176 for ; Fri, 21 May 2021 22:29:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230052AbhEUWbL (ORCPT ); Fri, 21 May 2021 18:31:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230041AbhEUWbL (ORCPT ); Fri, 21 May 2021 18:31:11 -0400 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BB71C061574 for ; Fri, 21 May 2021 15:29:47 -0700 (PDT) Received: by mail-oi1-x234.google.com with SMTP id z3so21078377oib.5 for ; Fri, 21 May 2021 15:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EngQxQ8pAxLlJBn/CT0/ygSPsaAUFbJgCPVI7msVSrE=; b=TrfQJ8N2w/PZfUfatb1HzibtfmMUhdQ2DgiFQIJStFuGzKRXy8oK0GdeoYJYfPxyzZ FOQPSoZ6MA2f+/kFqs8SUWKkbJmctFNy8cCm/NMFmwAguuXBfopKQUdtc/HYIo9hF4ck t5WULQvdPK0oHehowmwVdxL/PYZ2RqUL+ZUCXvpFEMZ46AAtzKAOh4Rx+6oH/DjkOR59 ixH5xOuuUK29U66MgsG0Mv8PoR8jBlsY1ioV1VTjZAlnUrxHGkd2PvaP+wFHZpSBazL8 YQtn0n2wHZzWSvDria4AC7HvHNdez5fkXsDbh7NAe2vAbwB4zDdNW6x5m9K3OZ6GEetn TB3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EngQxQ8pAxLlJBn/CT0/ygSPsaAUFbJgCPVI7msVSrE=; b=QYD3tsrtzNbJoh0DyWGjWn1NCRooHKXhqqXXX07UMA5Hc0/7BCGEc6658Z+WBID2IG SBWgFE/oWIyx2Dw/XFmriCoQlrrH71DNx4hUimTHKLsF1kyaiFW5TeB5MPPam0HG4nlP mI3IzaZvFmnXLVtoePmySMnlhGKo9Ndw5lOXlPujXh9FYqcZgqmbO3OLkjTVya5cMSiC EYt4dnmlM4zerGcw0hkv1nxtumVQ4jIseoCygUOEPqYnacgpxQdjcDyFuK24lMkmqGUa u4KvTRmmr0aLungL7Lzdo/IPKdyf31MclKXGhCdbOXJzw51yzNoxQ+M5/f321Ouy/8kz WN7A== X-Gm-Message-State: AOAM532hHB7BjW2HZRh7vXmDFtXFrlS/wURcarVaXBpMaqOdLW2uYjTR rrrsDnj4T8rQ7OXoO9R0CAoPpbmbec72pg== X-Google-Smtp-Source: ABdhPJxtCtkrRKA4z5pNaZdNtSRmI5b9VReFhB5RNjOCBvn+Q8Y3qPSXp3BIAF3Zxdufth+Vjumjig== X-Received: by 2002:aca:2311:: with SMTP id e17mr3708664oie.160.1621636186269; Fri, 21 May 2021 15:29:46 -0700 (PDT) Received: from localhost (fixed-187-189-187-231.totalplay.net. [187.189.187.231]) by smtp.gmail.com with ESMTPSA id y34sm1555536ota.16.2021.05.21.15.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 15:29:45 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v3 2/5] doc: improve asciidoc dependencies Date: Fri, 21 May 2021 17:29:38 -0500 Message-Id: <20210521222941.525901-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210521222941.525901-1-felipe.contreras@gmail.com> References: <20210521222941.525901-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org asciidoc needs asciidoc.conf, asciidoctor asciidoctor-extensions.rb. Neither needs the other. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 46d9b98dac..0f59cc0853 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -139,7 +139,7 @@ ASCIIDOC_CONF = -f asciidoc.conf ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ -amanversion=$(GIT_VERSION) \ -amanmanual='Git Manual' -amansource='Git' -ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -194,6 +194,7 @@ ASCIIDOC_DOCBOOK = docbook5 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' +ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation XMLTO_EXTRA += -x manpage.xsl From patchwork Fri May 21 22:29:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12274007 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02B35C04FF3 for ; Fri, 21 May 2021 22:29:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9DF4613AF for ; Fri, 21 May 2021 22:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230084AbhEUWbN (ORCPT ); Fri, 21 May 2021 18:31:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230040AbhEUWbM (ORCPT ); Fri, 21 May 2021 18:31:12 -0400 Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4D9BC061574 for ; Fri, 21 May 2021 15:29:48 -0700 (PDT) Received: by mail-oi1-x22e.google.com with SMTP id s19so21073512oic.7 for ; Fri, 21 May 2021 15:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=is0R4bXlC4saveY4qJsSXT8vZR9yttYUs3cwoxi8/XM=; b=isUg3wIq/5lhQwN09bTRRCg3LzHt32z4bdEtl7vHzIlvxkr+v3IViirIAdAPckKDBX 0avqf3vWLQ66jvKEfiYBNgkkS21tiWWDii46fzNGvyyIY1ZxL9SgQleyGshbHha0m1Tl S32C4KQ7c8lFR5aQIYr/Jn0jNPKuC+iWpkNOL6fvYZ8i1YZc+P5zjnxDY13vSkBrRZJK ITF6W11CaxSMFEl1zimqU7wl+61iyWc+6pizEx47DePFlJYc1xZQAO75MEVAXyOVtExv 52x+eUneeIRDDbtCKTdx1ylxLz6JThAUAzKot5bk+TqcqCremMr/yDspAwdMuHAdhwsA Q4UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=is0R4bXlC4saveY4qJsSXT8vZR9yttYUs3cwoxi8/XM=; b=X5MnfGNedcz8Lqn3nMrClzFLUhniB2dugYAXtFCwWemzlY6mEch+DQYwiCEZX8d6z2 LNLW8BdyVrsG2LEM8SZzfekiDuW5qPWSvyKdcn0cXszt3huXZk72eFvJ16tTv3MBmB7v 4sSAPXVRCpP6G7LJTQodHsYLV6MD6jrE1Wxh9QsuKBnQ66qudnVO6wmZJiecmfqF84Iz 6hnpAohs1qsL0Bz93ahs/9ndpqGAnNh86zME21PmewWT2NaPg1p+WkgWUjLnX5rG0bUr PpX45gscWlgk1+c69mDu53qZ8vHtW1JPAcspnwPPY7tpPueY/F5DYqczNbDgCw1jcSxm LnLw== X-Gm-Message-State: AOAM532EzdRENZQ/KkkXZr7OgLeqoNqHn7qtNMNkPAHh4JaCeojqjsuS Cqn02AMAtFqz/M0sm1A5cIqwiP7Th5WhPQ== X-Google-Smtp-Source: ABdhPJzPHkYEOe+KRVZRzfXXAv6NTIVnN//1+PPC0V6sDs0D2TxKDI3EShca2ZLimBoJ32/bG0TwDg== X-Received: by 2002:a05:6808:5d8:: with SMTP id d24mr3712883oij.49.1621636187903; Fri, 21 May 2021 15:29:47 -0700 (PDT) Received: from localhost (fixed-187-189-187-231.totalplay.net. [187.189.187.231]) by smtp.gmail.com with ESMTPSA id u6sm1578701otk.63.2021.05.21.15.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 15:29:47 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v3 3/5] doc: remove unnecessary rm instances Date: Fri, 21 May 2021 17:29:39 -0500 Message-Id: <20210521222941.525901-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210521222941.525901-1-felipe.contreras@gmail.com> References: <20210521222941.525901-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Commits 50cff52f1a (When generating manpages, delete outdated targets first., 2007-08-02) and f9286765b2 (Documentation/Makefile: remove cmd-list.made before redirecting to it., 2007-08-06) created these rm instances for a very rare corner-case: building as root by mistake. It's odd to have workarounds here, but nowhere else in the Makefile-- which already fails in this stuation, starting from Documentation/technical/. We gain nothing but complexity, so let's remove them. Comments-by: Jeff King Signed-off-by: Felipe Contreras --- Documentation/Makefile | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 0f59cc0853..73b88c3aad 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -296,8 +296,7 @@ docdep_prereqs = \ cmd-list.made $(cmds_txt) doc.dep : $(docdep_prereqs) $(DOC_DEP_TXT) build-docdep.perl - $(QUIET_GEN)$(RM) $@+ $@ && \ - $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ + $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ mv $@+ $@ ifneq ($(MAKECMDGOALS),clean) @@ -318,8 +317,7 @@ cmds_txt = cmds-ancillaryinterrogators.txt \ $(cmds_txt): cmd-list.made cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) - $(QUIET_GEN)$(RM) $@ && \ - $(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \ + $(QUIET_GEN)$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \ date >$@ mergetools_txt = mergetools-diff.txt mergetools-merge.txt @@ -327,7 +325,7 @@ mergetools_txt = mergetools-diff.txt mergetools-merge.txt $(mergetools_txt): mergetools-list.made mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*) - $(QUIET_GEN)$(RM) $@ && \ + $(QUIET_GEN) \ $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \ . ../git-mergetool--lib.sh && \ show_tool_names can_diff "* " || :' >mergetools-diff.txt && \ @@ -357,30 +355,25 @@ clean: $(RM) GIT-ASCIIDOCFLAGS $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_HTML) -d manpage -o $@+ $< && \ + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@+ $< && \ mv $@+ $@ $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_HTML) -o $@+ $< && \ + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@+ $< && \ mv $@+ $@ manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ %.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl) - $(QUIET_XMLTO)$(RM) $@ && \ - $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< + $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< %.xml : %.txt $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_XML) -d manpage -o $@+ $< && \ + $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@+ $< && \ mv $@+ $@ user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_XML) -d book -o $@+ $< && \ + $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@+ $< && \ mv $@+ $@ technical/api-index.txt: technical/api-index-skel.txt \ @@ -402,27 +395,24 @@ XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css XSLTOPTS += --param generate.consistent.ids 1 user-manual.html: user-manual.xml $(XSLT) - $(QUIET_XSLTPROC)$(RM) $@+ $@ && \ - xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \ + $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \ mv $@+ $@ git.info: user-manual.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi user-manual.texi: user-manual.xml - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ - $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \ + $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \ $(PERL_PATH) fix-texi.perl <$@++ >$@+ && \ rm $@++ && \ mv $@+ $@ user-manual.pdf: user-manual.xml - $(QUIET_DBLATEX)$(RM) $@+ $@ && \ - $(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \ + $(QUIET_DBLATEX)$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \ mv $@+ $@ gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ + $(QUIET_DB2TEXI) \ ($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \ $(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \ rm $(xml)+ &&) true) > $@++ && \ @@ -434,13 +424,11 @@ gitman.info: gitman.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ - $(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \ + $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \ mv $@+ $@ howto-index.txt: howto-index.sh $(HOWTO_TXT) - $(QUIET_GEN)$(RM) $@+ $@ && \ - '$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \ + $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \ mv $@+ $@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt @@ -450,7 +438,7 @@ WEBDOC_DEST = /pub/software/scm/git/docs howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ + $(QUIET_ASCIIDOC) \ sed -e '1,/^$$/d' $< | \ $(TXT_TO_HTML) - >$@+ && \ mv $@+ $@ From patchwork Fri May 21 22:29:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12274009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C921FC04FF3 for ; Fri, 21 May 2021 22:29:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB3D561176 for ; Fri, 21 May 2021 22:29:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbhEUWbS (ORCPT ); Fri, 21 May 2021 18:31:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230040AbhEUWbO (ORCPT ); Fri, 21 May 2021 18:31:14 -0400 Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51586C0613ED for ; Fri, 21 May 2021 15:29:50 -0700 (PDT) Received: by mail-ot1-x336.google.com with SMTP id i14-20020a9d624e0000b029033683c71999so8246683otk.5 for ; Fri, 21 May 2021 15:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S6mtXCFHlTXtJXXDRP/2nisWYEopAtKyVCxF0YkA9ss=; b=bsY0gNdzY6nyDDluSOWRLQVdxxkuFpUxZocYmU2bpDgWqbJWPQTTPIHUyAlqt1aqMv aayIYRtuwFL0Vifrs6VIXpQDGs30H1sHAlxBn7sq45n3aJDcX2+APuN+wDisFO7/pfc5 piNAz1lxK4x5HgE++Qpk5x5OR2eaMzG1lSLOe4dCDgs3CgFXBDUpLxUYDNS9tnJitvAf E+9e8bFc5ttMI4+uWalKr6IMwTV0trIDO/eUTsVxwpEjQWcVILoYjDqTvDuf8ACTaWZ2 hkx3o65R6cvKpBf36HSIngRv8phNZzRfxP3EJMZEoq/0e+Dun2H4UPiZIm4gr9Fod7Uz gqKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S6mtXCFHlTXtJXXDRP/2nisWYEopAtKyVCxF0YkA9ss=; b=gkDwrHqPhdkRkCohWg5tOBmPEjdZXMoEofcg21XLR32lzPEYoCbVbsHv0LfBhMod7+ L9HWCqhDYaOyzbD5CHiGbkhrjVUDHSUjobxvJmZAQG2C/BompbU57Vkf7SAYCiG89KGr RYtLyNaGhGaf7na/UmlMeoLNTS//eKoqW0JFZokuIrf9te1byT3ouMTFh45go3JIYu89 dZLZWjohlVClGboU5Nw94rzBBplJJJfcgXtGR2VHtPtfWlajLdi+WdyV54yy3LztI1BP OFn3HvdwB0cdrCxwisS1oIAEtgTCRW85IiHA4xd0LDmVm0cqntWI46n241k42DNSY2UN 7sAg== X-Gm-Message-State: AOAM532QY30j0rKOfqo7CYGJkuhUpkeYRh8VIBx5TYOCwXC4hpa4jz5P hUAdyPob+Ztbz4V0mpF8TqaElW037aHbag== X-Google-Smtp-Source: ABdhPJwati36NyAv6jMPFlOmqBfmb6T4mPo4ydvKiG+TZOX9GMVD6PPxTqlYpXWe5QSQy8rCYQWLOg== X-Received: by 2002:a9d:4a8a:: with SMTP id i10mr10096275otf.282.1621636189413; Fri, 21 May 2021 15:29:49 -0700 (PDT) Received: from localhost (fixed-187-189-187-231.totalplay.net. [187.189.187.231]) by smtp.gmail.com with ESMTPSA id q63sm1408644oic.15.2021.05.21.15.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 15:29:49 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v3 4/5] doc: simplify Makefile using .DELETE_ON_ERROR Date: Fri, 21 May 2021 17:29:40 -0500 Message-Id: <20210521222941.525901-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210521222941.525901-1-felipe.contreras@gmail.com> References: <20210521222941.525901-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Currently GNU make already removes files when catching an interruption signal, however, in order to deal with other kinds of errors a workaround is in place to store target output to a temporary file, and only move it to its right place on success. By enabling the built-in .DELETE_ON_ERROR we let make do this task, so we don't have to. This way the rules can be simplified a lot. Suggested-by: Ævar Arnfjörð Bjarmason Signed-off-by: Felipe Contreras --- Documentation/Makefile | 47 +++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 73b88c3aad..eaff97dcb8 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -296,8 +296,7 @@ docdep_prereqs = \ cmd-list.made $(cmds_txt) doc.dep : $(docdep_prereqs) $(DOC_DEP_TXT) build-docdep.perl - $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ - mv $@+ $@ + $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@ $(QUIET_STDERR) ifneq ($(MAKECMDGOALS),clean) -include doc.dep @@ -355,12 +354,10 @@ clean: $(RM) GIT-ASCIIDOCFLAGS $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $< $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ @@ -369,12 +366,10 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< %.xml : %.txt $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $< user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS - $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $< technical/api-index.txt: technical/api-index-skel.txt \ technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) @@ -395,41 +390,35 @@ XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css XSLTOPTS += --param generate.consistent.ids 1 user-manual.html: user-manual.xml $(XSLT) - $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \ - mv $@+ $@ + $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $< git.info: user-manual.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi user-manual.texi: user-manual.xml - $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \ - $(PERL_PATH) fix-texi.perl <$@++ >$@+ && \ - rm $@++ && \ - mv $@+ $@ + $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@+ && \ + $(PERL_PATH) fix-texi.perl <$@+ >$@ && \ + rm $@+ user-manual.pdf: user-manual.xml - $(QUIET_DBLATEX)$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \ - mv $@+ $@ + $(QUIET_DBLATEX)$(DBLATEX) -o $@ $(DBLATEX_COMMON) $< gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl $(QUIET_DB2TEXI) \ ($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \ $(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \ - rm $(xml)+ &&) true) > $@++ && \ - $(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \ - rm $@++ && \ - mv $@+ $@ + rm $(xml)+ &&) true) > $@+ && \ + $(PERL_PATH) cat-texi.perl $@ <$@+ >$@ && \ + rm $@+ gitman.info: gitman.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml - $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \ - mv $@+ $@ + $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@ howto-index.txt: howto-index.sh $(HOWTO_TXT) - $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \ - mv $@+ $@ + $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt @@ -440,8 +429,7 @@ howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS $(QUIET_ASCIIDOC) \ sed -e '1,/^$$/d' $< | \ - $(TXT_TO_HTML) - >$@+ && \ - mv $@+ $@ + $(TXT_TO_HTML) - >$@ install-webdoc : html '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST) @@ -482,4 +470,7 @@ doc-l10n install-l10n:: $(MAKE) -C po $@ endif +# Delete the target file on error +.DELETE_ON_ERROR: + .PHONY: FORCE From patchwork Fri May 21 22:29:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12274011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55051C4707A for ; Fri, 21 May 2021 22:29:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37F39613AF for ; Fri, 21 May 2021 22:29:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230114AbhEUWbU (ORCPT ); Fri, 21 May 2021 18:31:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbhEUWbQ (ORCPT ); Fri, 21 May 2021 18:31:16 -0400 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A06F9C0613CE for ; Fri, 21 May 2021 15:29:51 -0700 (PDT) Received: by mail-ot1-x332.google.com with SMTP id t10-20020a05683022eab0290304ed8bc759so19398908otc.12 for ; Fri, 21 May 2021 15:29:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CppMIyxNHXEDrd4wQvWEPsZhtP26lqLbX5TM9tK52QI=; b=HgvtV9F0IWPWoqVBjLLMKaJSPTSzu3z21yVEby+fZmbgr9M7WmCRHpmfWoG2DnYDjK ZCXjxWdrRmagD/N3iTe7lB+xPMf98V5saVtR/VNgLSGT47lb83zW4H22hxMhpOSG8luR Avfhr3IXdd0ptISLoKYD4cPZBeS8ifLXsE9OCUZ4Sik8dP18BYL6WECpoSqpsIcUXpes HJR0Q5w3CT+f00Wi4kgj1RoaTIuIH3epMjh636r+QkQ7kFk/XxtcuLgVxfwND+gFau5h vunwzrEWUT/VqXwBKturNe60jYRbT3w7zoC2CvsRlMRj80Mbf1yTKU8gs5/afJXE3eLb OO2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CppMIyxNHXEDrd4wQvWEPsZhtP26lqLbX5TM9tK52QI=; b=n7QNmxVlxeamKajBL1E8pt0VRfdiT/ZRGw28/LK0WGDaED7aOkS0fsuGqj8X8zcE9p uaPnEuBr5iTg++DIDMBtt2mge3jSpq8hNXLqWryZ1OEuMPxIeuDdz87l9YbivDczhGvT g4FProYIFPAmSvHvnpEqmzVBFW6sSLYLPFVYkjEzjtlL9qBWSnP/HF42uXwu5LAcb2ms R3Kw71BHjorreFp7a8CZqkB9QYjC7qrYh2r76Kc77Qy6QHYbVkE5Pp6PPapu5yXOh9to st9s9rDYSu4YLj+7Z029Dnx65vyAm6NL/efxqKNTIfqPNujJ8P9E1g5mfhn1Hrnt3ELk n5rw== X-Gm-Message-State: AOAM532Vt8p0ytdQ/4Wvv8aaRednuNhf4+jBVs4yQzqm4X15m8752FA0 FnxERguJ4nS7R5anF3Mx5cUb+OJ56ODqiQ== X-Google-Smtp-Source: ABdhPJxtnXTYgYpj2pf16xkQD/28mkuiZhX769c2K1vqmGjC5U6L/UVMI1kxpVz2XldwxN1rV8PfpQ== X-Received: by 2002:a05:6830:349b:: with SMTP id c27mr10529803otu.251.1621636190818; Fri, 21 May 2021 15:29:50 -0700 (PDT) Received: from localhost (fixed-187-189-187-231.totalplay.net. [187.189.187.231]) by smtp.gmail.com with ESMTPSA id 19sm1343198oiy.11.2021.05.21.15.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 15:29:50 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v3 5/5] doc: avoid using rm directly Date: Fri, 21 May 2021 17:29:41 -0500 Message-Id: <20210521222941.525901-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210521222941.525901-1-felipe.contreras@gmail.com> References: <20210521222941.525901-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org That's what we have $(RM) for. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index eaff97dcb8..f5605b7767 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -398,7 +398,7 @@ git.info: user-manual.texi user-manual.texi: user-manual.xml $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@+ && \ $(PERL_PATH) fix-texi.perl <$@+ >$@ && \ - rm $@+ + $(RM) $@+ user-manual.pdf: user-manual.xml $(QUIET_DBLATEX)$(DBLATEX) -o $@ $(DBLATEX_COMMON) $< @@ -407,9 +407,9 @@ gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl $(QUIET_DB2TEXI) \ ($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \ $(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \ - rm $(xml)+ &&) true) > $@+ && \ + $(RM) $(xml)+ &&) true) > $@+ && \ $(PERL_PATH) cat-texi.perl $@ <$@+ >$@ && \ - rm $@+ + $(RM) $@+ gitman.info: gitman.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi