From 9fb312b59886f079e2bef276b08891b725b413d7 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Thu, 14 Nov 2024 13:29:45 -0300
Subject: Makefile: Adapt code for mkwb-html subcommand

---
 .gitignore |  1 +
 Makefile   | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8cedcc..465c6cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /src/content/*.xml
 /src/*.sortdata
 /src/global.conf
+/src/combined.conf
diff --git a/Makefile b/Makefile
index 987f098..7fa49f8 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,7 @@ derived-assets = \
 	$(sources.snippets)                      \
 	$(sources.conf)                          \
 	src/global.conf                          \
+	src/combined.conf                        \
 	$(articles.indexentry)                   \
 	$(articles.feedentry)                    \
 	$(articles.sortdata)                     \
@@ -106,17 +107,17 @@ $(sources.html): src/headers.txt
 src/global.conf: src/base.conf
 	mkwb conf src/base.conf > $@
 
+src/combined.conf: src/base.conf src/global.conf
+	cat src/base.conf src/global.conf > $@
+
 src/content/atom.xml src/content/blog.html: $(articles.sortdata) \
-		src/base.conf src/global.conf
+		src/combined.conf
 
 src/content/atom.xml: $(articles.feedentry)
-	mkwb feed src/base.conf src/global.conf $(articles.sortdata) > $@
+	mkwb feed src/combined.conf $(articles.sortdata) > $@
 
 src/content/blog.html: $(articles.indexentry) src/content/blog.htmlbody
-	mkwb indexbody $*.conf $(articles.sortdata) | cat $*.htmlbody - > $@-t
-	mkwb html $@-t > $@
-	rm -f $@-t
-
+	mkwb indexbody $*.conf $(articles.sortdata) | mkwb html $*.htmlbody > $@
 
 
 check-unit:
-- 
cgit v1.2.3