diff options
| author | Wojtek Kosior <koszko@koszko.org> | 2023-08-30 14:18:30 +0200 |
|---|---|---|
| committer | Wojtek Kosior <koszko@koszko.org> | 2023-08-30 14:18:30 +0200 |
| commit | 60f60080f4d7817768f3adc9640089a8398a9a58 (patch) | |
| tree | bbdeaa66e66d7abeb1fc125f54cdbc473d8613e4 | |
| parent | 9e71165dd3fa31accbcce8d5875aa774ab8b8fe1 (diff) | |
| download | koszko-org-server-60f60080f4d7817768f3adc9640089a8398a9a58.tar.gz koszko-org-server-60f60080f4d7817768f3adc9640089a8398a9a58.zip | |
Make it more convenient to override the guix command and commit
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 13 |
2 files changed, 10 insertions, 4 deletions
@@ -7,6 +7,7 @@ container-runner log test-root +Makefile.local pidfile hosts *.touchfile @@ -4,14 +4,16 @@ # # Available under the terms of Creative Commons Zero v1.0 Universal. -GUIX := guix +-include Makefile.local + +GUIX ?= guix # Almost all commands in this Makefilo are run through `guix time-machine` with # Guix revision fixed to the one from the commit below. This ensures that the # same working environment is always used. -GUIX_COMMIT := a86979b41a49a8fcdaa887970ba594dbba701226 +GUIX_COMMIT ?= a86979b41a49a8fcdaa887970ba594dbba701226 -GUIX_TM = $(GUIX) time-machine --commit=$(GUIX_COMMIT) -- +GUIX_TM ?= $(GUIX) time-machine --commit=$(GUIX_COMMIT) -- GUIX_LOAD_PATHS = $$( \ find subrepos/ -mindepth 1 -maxdepth 1 \ @@ -35,7 +37,7 @@ ALL_EGG_INFOS = \ $(HYDRILLA_INFO) CONTAINER_PREREQUISITES = container.scm $(ALL_EGG_INFOS) hydrilla-wsgi.py \ - exim.conf + exim.conf Makefile.local TEST_ROOT_DIR = "/tmp/$$(pwd | sed 's|/|!|g')"'!!test-root/current' @@ -48,6 +50,9 @@ $(HYDRILLA_WEBSITE_INFO): $(HYDRILLA_INFO): $(MAKE) -C subrepos/hydrilla dist +Makefile.local: + touch $@ + container-runner: | $(CONTAINER_PREREQUISITES) container-runner.touchfile: $(CONTAINER_PREREQUISITES) |