From: Andre Noll <maan@tuebingen.mpg.de>
Date: Wed, 8 May 2024 00:00:34 +0000 (+0200)
Subject: index.html: Simplify make rule.
X-Git-Tag: v1.0.2~15
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=8560e29e73bd4d9fa99053ede58be16c29c36c76;p=dss.git

index.html: Simplify make rule.

This avoids index.html.in and parses index.html.m4 only once.
---

diff --git a/Makefile b/Makefile
index f06f80c..f462643 100644
--- a/Makefile
+++ b/Makefile
@@ -159,16 +159,9 @@ endef
 README:
 	@printf '%s\n' "$(README)"
 
-index.html.in: index.html.m4
-	$(call SAY, M4 $<)
+index.html: index.html.m4 Makefile NEWS
+	$(call SAY, M4 $@)
 	$(M4) $< > $@
-index.html: index.html.in NEWS
-	$(call SAY, MD $@)
-	sed -e '/@README@/,$$d' index.html.in > $@
-	printf '<p> %s </p>\n' "$(DESCRIPTION1)" >> $@
-	printf '<p> %s </p>\n' "$(DESCRIPTION2)" >> $@
-	printf '<p> %s </p>\n' "$(DESCRIPTION3)" >> $@
-	sed -e '1,/@README@/d' -e '/@NEWS@/,$$d' index.html.in >> $@
 	markdown NEWS >> $@
 
 -include Makefile.local
diff --git a/index.html.m4 b/index.html.m4
index 4b23c81..42ec52b 100644
--- a/index.html.m4
+++ b/index.html.m4
@@ -26,7 +26,9 @@ dnl SPDX-License-Identifier: GPL-2.0
 	[<a href="`#'news">News</a>]
 	<hr>
 
-	@README@
+	<p> DESCRIPTION1() </p>
+	<p> DESCRIPTION2() </p>
+	<p> DESCRIPTION3() </p>
 
 	<h2> <a name="installation">Installation</a> </h2>