From patchwork Sat Apr 6 21:17:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62786 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C8D5027BBEA; Sat, 6 Apr 2024 22:19:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F26727BBE2 for ; Sat, 6 Apr 2024 22:19:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtDRF-0000Me-CS; Sat, 06 Apr 2024 17:19:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtDRC-0000Lc-Kp for guix-patches@gnu.org; Sat, 06 Apr 2024 17:18:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtDRB-0004RN-WC for guix-patches@gnu.org; Sat, 06 Apr 2024 17:18:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtDRI-0000ZP-CD for guix-patches@gnu.org; Sat, 06 Apr 2024 17:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH v2 01/12] maint: Cater for running `make dist' from a worktree. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 21:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.17124383051800 (code B ref 70169); Sat, 06 Apr 2024 21:19:04 +0000 Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:25 +0000 Received: from localhost ([127.0.0.1]:41101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtDQf-0000Sq-A1 for submit@debbugs.gnu.org; Sat, 06 Apr 2024 17:18:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtDQe-0000S7-62 for 70169@debbugs.gnu.org; Sat, 06 Apr 2024 17:18:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtDQS-0004Dx-GG; Sat, 06 Apr 2024 17:18:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=q+rZKnDHKGZdZJcJPA/zMKlTSK8VKTBca9VS8g34lA8=; b=Cf8z/Gv9j7l3W03K6lsC mL3B2CD6ti3YBdZMJKWFoJIQlZnuZljvuW9dO8LeI4CwyZnpMF23DkXuJF8KtuTfuuC4V64TeNRLg MOH1GrbDJpEvhAIGaKW8s0HJwdegfR/uRiyY61YQVA79j5beuaYr7QR0oG90hPC1JY9w23Uv7M24J 6+vUTJiDRHf+t+HZJnVLNeBAdk4TxMShccomtaP5WMSnu/QPEpggZqupbd3a6OPmbK3crHP+5PZZ+ L4OYh6QKqMMUaI0o/69aWhgHkfsnjEvl7FfkutZLAErYqBtCz68/YN895Wmdqn24jsk0375XJD8Cl uyD/YycHQHMUVw==; From: Janneke Nieuwenhuizen Date: Sat, 6 Apr 2024 23:17:53 +0200 Message-ID: <3f5f29f3a3f29a9e09a9275e8c10ef8b8a4cc779.1712437365.git.janneke@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * Makefile.am (gen-ChangeLog): Check for existance of `.git', rather than it being a directory. (gen-AUTHORS): Likewise. Change-Id: I1b7f8cc147084c1804deb7be9d36e5eeda2599cb --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c5688ac13..2b5e145095 100644 --- a/Makefile.am +++ b/Makefile.am @@ -972,7 +972,7 @@ gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" gen-ChangeLog: - $(AM_V_GEN)if test -d .git; then \ + $(AM_V_GEN)if test -e .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ > $(distdir)/ChangeLog.tmp; \ rm -f $(distdir)/ChangeLog; \ @@ -980,7 +980,7 @@ gen-ChangeLog: fi gen-AUTHORS: - $(AM_V_GEN)if test -d .git; then \ + $(AM_V_GEN)if test -e .git; then \ rm -f "$(distdir)/AUTHORS"; \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/generate-authors.scm" \