From patchwork Wed Apr 17 19:08: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: 63108 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 A895227BBEB; Wed, 17 Apr 2024 20:10:23 +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 2F2E027BBE9 for ; Wed, 17 Apr 2024 20:10:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxAfG-0002to-Ji; Wed, 17 Apr 2024 15:09:50 -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 1rxAfF-0002tY-3j for guix-patches@gnu.org; Wed, 17 Apr 2024 15:09:49 -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 1rxAfE-0003JR-Rg for guix-patches@gnu.org; Wed, 17 Apr 2024 15:09:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxAfR-0000Zw-RT for guix-patches@gnu.org; Wed, 17 Apr 2024 15:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70380] [PATCH v4 1/6] maint: Resurrect running `make' from a tarball. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Apr 2024 19:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70380@debbugs.gnu.org Received: via spool by 70380-submit@debbugs.gnu.org id=B70380.17133809581822 (code B ref 70380); Wed, 17 Apr 2024 19:10:01 +0000 Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 19:09:18 +0000 Received: from localhost ([127.0.0.1]:47595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxAej-0000TJ-D6 for submit@debbugs.gnu.org; Wed, 17 Apr 2024 15:09:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxAeh-0000Sw-Lm for 70380@debbugs.gnu.org; Wed, 17 Apr 2024 15:09:16 -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 1rxAeP-0003BY-9n; Wed, 17 Apr 2024 15:08:57 -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=e3nICThubp5PXYfJbD5e8q1uNGCvl7PKjipBv9NaYCI=; b=dq5AsOxM3uF9uubOSB4r HquqRozeL6GwM/yWc/LDiIWbeYliO6a+KPLm6qaFiH1VFPYwhs5xfgsZH/K9nwcZ7IXZ/vfNfv4ao cndHDnVGMrszS+FJrbH00YIV7YF8BJV68Sg42ePvJb+mMo9i3Lm9tVuGya9hWpEWpKD9KD8dPpQoD rQf60Nbl2HMh/KxrwxATH4r5bqCkCNemC5XqP7IDA1khmyHD74t8qx2FREE3OR1L1zGSGRT668gjx RSb93nF5giKpjeeceu0q4NnPsY14JHaXekpVkgMIvLJDQpV7i0pNAck+s7cCwuLldVdL0i5Ux8P0n 8dLED6vKfgJGBQ==; From: Janneke Nieuwenhuizen Date: Wed, 17 Apr 2024 21:08:45 +0200 Message-ID: <543d5a5e035e6a6dc68013393cc470dcf1dc0772.1713379858.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 This is a follow-up to commit 8b972da068708a8b17f3ab153ea940690ca49ca9 Makefile.am: Auto-configure Git on 'make'. * configure.ac (in_git_p): New conditional. * Makefile.am (nodist_noinst_DATA): Use it to only enable this when building from Git. Change-Id: I09a90a59a4933a8cdb04124467d38209171f2a57 --- Makefile.am | 5 +++++ configure.ac | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile.am b/Makefile.am index 25b3eb3378..98008c528d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1241,7 +1241,12 @@ COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= cp etc/git/commit-msg $@; \ fi +# The etc/git/ config files are not distributed and have no use when building +# from a tarball. Do not add dependencies on these to *_DATA when building +# from a tarball, as that breaks the build. +if in_git_p nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg +endif # Downloading up-to-date PO files. diff --git a/configure.ac b/configure.ac index ecbd596a34..8c3a06da37 100644 --- a/configure.ac +++ b/configure.ac @@ -265,6 +265,16 @@ dnl Documentation translation. AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo]) +AC_MSG_CHECKING([if building from git]) +if test -e .git; then + in_git_p=yes +else + in_git_p=no +fi +AC_MSG_RESULT([$in_git_p]) +AM_CONDITIONAL([in_git_p], + [test "x$in_git_p" = "xyes"]) + case "$storedir" in /gnu/store) ;;