From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 4ClbLJ8eIGZQYwAA62LTzQ:P1 (envelope-from ) for ; Wed, 17 Apr 2024 21:10:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 4ClbLJ8eIGZQYwAA62LTzQ (envelope-from ) for ; Wed, 17 Apr 2024 21:10:23 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=dq5AsOxM; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713381023; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=e3nICThubp5PXYfJbD5e8q1uNGCvl7PKjipBv9NaYCI=; b=bP7/D7sl4zwmqhR0iExiwgo23VXRjqSa5LosS6W8j1JKacZC4mHs7lqfR9E894zRLp5s5Y Zb33bMmGBl2p0TXoV+qoz1yFf8iLUCo/pMInZ3aHZkiv71IdX5MZvenHzXpW95FRV15fIm AykGxdeZdhI7y5RI5jx/rEKG7BzonKPlYwlUhO7pPobjTsXOkcY0Kh2cXkMIg5wk7b05o+ EumH4jRwNCBkuv0MRqgAN19MwF2PltAUyHTVdnFkUPVUsqnhOEWY1kPxmLZ3EnYCSqwGN6 oNEp2ttv8H5CUkR3SxeiXpQs3opxAxkH+AfA0Zje6JU3CB7cTOLCFshh2Sa/sg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=dq5AsOxM; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713381023; a=rsa-sha256; cv=none; b=EuI/9u9TFXcAegwjhfkx30/XWATziVSAA9nuNXEB8GGwiQ3k67AHn2Aie4LOREL5Dq1YZy Z7BBCKBxyl35X/lL/rVQcYyKyyJbpOcnSyek9+9uhVQENZetMlKCVwnddaeT8jNAZ3z7lm Cgl5yraTT7SAISvdEoCdzuZolTZvLxhyglerIAqRY1H4/RhTo+/I6E4SW3tA4ZmGXGOcGC 15oR7QZj3vNfUAKcdESqMPVgL++K+CDCUIZtO1RdfTMygFTcrgIAZyxPLStOhhAqL1zscI qeiHYYOq2dn4HgtHCP0TpsRVLpqcdomD73o5JJ2B/UFDLv8Ixt55PvLT4X1Tpg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4552D676D0 for ; Wed, 17 Apr 2024 21:10:23 +0200 (CEST) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.58 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.58 X-Migadu-Queue-Id: 4552D676D0 X-TUID: MuUnkKEQTGy4 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) ;; -- 2.41.0