aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2024-03-01 09:29:58 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2025-06-15 01:30:22 +0200
commit254e9bef6cfa1f1c78b6afd4d3be03ca99208766 (patch)
tree1ef4f44d1da0bc2e37cdb3a78aee06fa666b5d54
parentb1e7decf2b962a98e19eca618bb56f0c65c2a14d (diff)
downloadhaunt-blog-254e9bef6cfa1f1c78b6afd4d3be03ca99208766.tar.gz
haunt-blog-254e9bef6cfa1f1c78b6afd4d3be03ca99208766.tar.bz2
haunt-blog-254e9bef6cfa1f1c78b6afd4d3be03ca99208766.zip
Makefile: cleanup haunt calls.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--Makefile16
-rw-r--r--patches/v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch (renamed from v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch)0
2 files changed, 6 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 5c8f04b..9c31385 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,14 @@
CURL ?= curl
BLOG_URL ?= https://blog.replicant.us/page
+
+GUILE_PATCH = v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch
GUIX_COMMIT ?= b25b94335a3ee8d68d2145da8e5ea0325ecea451
GUIX_SHELL ?= guix time-machine --commit=$(GUIX_COMMIT) -- shell -C
GUIX_PACKAGES ?= python python-beautifulsoup4 python-html2text python-sh
+
CONVERT ?= $(GUIX_SHELL) $(GUIX_PACKAGES) -- python3 convert.py
+HAUNT ?= $(GUIX_SHELL) --with-patch=guile=patches/$(GUILE_PATCH) haunt -- haunt
SENTINEL =
@@ -92,11 +96,7 @@ markdown: html
done
build:
- $(GUIX_SHELL) \
- --with-patch=guile=v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch \
- haunt \
- -- \
- haunt build
+ $(HAUNT) build
help:
@printf "%s\n\t%s\n\t%s\n\t%s\n\t%s\n" \
@@ -107,11 +107,7 @@ help:
"markdown # create markdown pages. To be done after reviewing links.txt." \
serve:
- $(GUIX_SHELL) \
- --with-patch=guile=v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch \
- haunt \
- -- \
- haunt serve -w -p $(HAUNT_PORT)
+ $(HAUNT) serve -w -p $(HAUNT_PORT)
website.tar.gz: build
tar \
diff --git a/v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch b/patches/v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch
index 906ce56..906ce56 100644
--- a/v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch
+++ b/patches/v1-0001-SRFI-19-Add-support-for-ISO-8601-zones-with-a-col.patch