From de2ece0ec785b7187e24fa43d1c00465a290443d Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Tue, 29 Aug 2023 16:00:36 +0200
Subject: Make sure Makefile's 'dist' target can also be run with newer Guix

---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5ee80ec..ca95a75 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,12 @@ GUIX_COMMIT := a86979b41a49a8fcdaa887970ba594dbba701226
 
 GUIX_TM = $(GUIX) time-machine --commit=$(GUIX_COMMIT) --
 
-GUIX_PACKAGE_SELECTION_FLAGS = -f guix.scm
+GUIX_FULL_PACKAGE_FLAGS = -f guix.scm
+GUIX_MINIMAL_PACKAGE_FLAGS = -e '(@ (hydrilla-base) hydrilla-without-haketilo)' -L ./guix-module-dir
+GUIX_PACKAGE_SELECTION_FLAGS = $(GUIX_FULL_PACKAGE_FLAGS)
 
 GUIX_DEVSHELL = $(GUIX_TM) shell -D $(GUIX_PACKAGE_SELECTION_FLAGS) --
+GUIX_MINIMAL_DEVSHELL = $(GUIX_TM) shell -D $(GUIX_MINIMAL_PACKAGE_FLAGS) --
 
 GET_VER = $$(grep '^Version:' src/hydrilla.egg-info/PKG-INFO | cut -d' ' -f2)
 RECORD_VER = VER="$(GET_VER)"
@@ -40,7 +43,7 @@ wheel:
 # Make a source tarball and repack in a deterministic way so that its
 # reproducible.
 dist src/hydrilla/_version.py:
-	$(GUIX_DEVSHELL) python3 -m build -s
+	$(GUIX_MINIMAL_DEVSHELL) python3 -m build -s
 	$(RECORD_VER) &&                                           \
 		RELNAME=hydrilla-"$$VER" &&                        \
 		DISTFILE=dist/"$$RELNAME".tar.gz &&                \
@@ -110,7 +113,7 @@ shell-with-haketilo: dist
 .PHONY:
 shell-with-hydrilla-only:
 	$(MAKE) shell-with-haketilo \
-		GUIX_PACKAGE_SELECTION_FLAGS="-e '(@ (hydrilla-base) hydrilla-without-haketilo)' -L ./guix-module-dir"
+		GUIX_PACKAGE_SELECTION_FLAGS="$(GUIX_MINIMAL_PACKAGE_FLAGS)"
 
 catalogs:
 	$(GUIX_DEVSHELL) python3 setup.py compile_catalog
-- 
cgit v1.2.3