From patchwork Mon Apr 8 18:46:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62870 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 A187027BBEA; Mon, 8 Apr 2024 19:48:54 +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 21D8627BBE2 for ; Mon, 8 Apr 2024 19:48:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtu2D-00045K-E7; Mon, 08 Apr 2024 14:48: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 1rtu28-00042P-EF for guix-patches@gnu.org; Mon, 08 Apr 2024 14:47:56 -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 1rtu28-00056D-6F for guix-patches@gnu.org; Mon, 08 Apr 2024 14:47:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtu2E-0005WQ-Nj for guix-patches@gnu.org; Mon, 08 Apr 2024 14:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH v3 02/13] 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: Mon, 08 Apr 2024 18:48:02 +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.171260204720857 (code B ref 70169); Mon, 08 Apr 2024 18:48:02 +0000 Received: (at 70169) by debbugs.gnu.org; 8 Apr 2024 18:47:27 +0000 Received: from localhost ([127.0.0.1]:47632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtu1d-0005QA-LM for submit@debbugs.gnu.org; Mon, 08 Apr 2024 14:47:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtu1b-0005Pc-Jf for 70169@debbugs.gnu.org; Mon, 08 Apr 2024 14:47: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 1rtu1O-0004zJ-OC; Mon, 08 Apr 2024 14:47:10 -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=KGnBcCOaI/P7TrSp+LGS Shglouzw+rUPRPQupsp/lRPPUYFyT0wimBjhcDCZB8aA/fiyUQ9CCbni3E37s9VAkMLmaGw52u0mA r6kkHnmbQRGsg+L6I8ZpK7ki0D+eQh/3hsoXIXcDw9rMxJK9zHZzBdAWBXWeWxbpOn096TWyrmLP4 Zhox6/U2eJ2b1R+RmgfIoU2DZtla/pReNP9JyCCLkEPyFvgO9uIVjeMqocoF0m7sbZJhw5TUAs8f/ s6tgjTP+7Nn+qKFlcCIM9iQn5Z58FRKcOIXpItG5GfBZ7Bw/dOctb3yZt3/XBZv2yxXWTaKeRiqqc dLoTTrR2j62fbQ==; From: Janneke Nieuwenhuizen Date: Mon, 8 Apr 2024 18:46:45 +0000 Message-ID: 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" \