]> git.tue.mpg.de Git - dss.git/commitdiff
projects / dss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1184ae7)
index.html: Move man page to separate web page.
authorAndre Noll <maan@tuebingen.mpg.de>
Tue, 7 May 2024 23:08:41 +0000 (01:08 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Tue, 2 Jul 2024 16:52:03 +0000 (18:52 +0200)
This shortens index.html and simplifies the build because we can
ditch the sed command which cuts out the body of the html generated
by groff(1).

Makefile patch | blob | history
index.html.m4 patch | blob | history

diff --git a/Makefile b/Makefile
index 46b9c8cf8d00e98f648b4d813fb2fe8c02c9202a..2db46b2ae6ffb8fd473679106a94ba867e043213 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,6 @@ $(PACKAGE): $(objs)
        $(call SAY, CC $<)
        $(CC) -c -o $@ $(DSS_CPPFLAGS) $(CPPFLAGS) $(DSS_CFLAGS) $(CFLAGS) \
                -MMD -MF $(*F).d -MT $@ $<
-
 .PHONY: all clean install README
 .PRECIOUS: %.lsg.c %.lsg.h %.suite %.1
 $(PACKAGE).suite: $(PACKAGE).suite.m4 Makefile
@@ -123,7 +122,7 @@ $(PACKAGE).suite: $(PACKAGE).suite.m4 Makefile
        $(GZIP) < $< > $@
 %.1.html: %.1
        $(call SAY, GROFF $<)
-       $(GROFF) $< | sed -e '1,/^<body>/d; /^<\/body>/,$$d' > $@
+       $(GROFF) $< > $@
 clean:
        $(call SAY, CLEAN)
        $(RM) *.[od] $(all) *.html $(PACKAGE).1 $(PACKAGE).suite \
@@ -163,7 +162,7 @@ README:
 index.html.in: index.html.m4
        $(call SAY, M4 $<)
        $(M4) $< > $@
-index.html: dss.1.html index.html.in INSTALL NEWS
+index.html: index.html.in INSTALL NEWS
        $(call SAY, MD $@)
        sed -e '/@README@/,$$d' index.html.in > $@
        printf '<p> %s </p>\n' "$(DESCRIPTION1)" >> $@
@@ -174,7 +173,5 @@ index.html: dss.1.html index.html.in INSTALL NEWS
        sed -e '1,/@NEWS@/d' -e '/@INSTALL@/,$$d' index.html.in >> $@
        markdown INSTALL >> $@
        sed -e '1,/@INSTALL@/d' -e '/@MAN_PAGE@/,$$d' index.html.in >> $@
-       cat dss.1.html >> $@
-       sed -e '1,/@MAN_PAGE@/d' index.html.in >> $@
 
 -include Makefile.local
diff --git a/index.html.m4 b/index.html.m4
index 4d47de59a86de29ab43f79e3b5f4879da9f3c7d3..91b741157a9530cb291ddc8aeb21202f61ca10cf 100644 (file)
--- a/index.html.m4
+++ b/index.html.m4
@@ -26,7 +26,6 @@ dnl SPDX-License-Identifier: GPL-2.0
        [<a href="#news">NEWS</a>]
        [<a href="#install">INSTALL</a>]
        [<a href="#resources">Resources</a>]
-       [<a href="#manpage">Man page</a>]
 
        <hr>
 
@@ -70,19 +69,9 @@ dnl SPDX-License-Identifier: GPL-2.0
                <li> <code>git clone CLONE_URL()</code> </li>
                <li> <a href="GITWEB_URL()">Gitweb</a> </li>
                <li> <a href="HOME_URL()">Author home page</a> </li>
+               <li> <a href="PACKAGE().1.html">manual page</a> </li>
                <li> Contact: <a href="mailto:EMAIL()">AUTHOR() &lt;EMAIL()&gt;</a> </li>
                <li> License: <a href="LICENSE_URL()">LICENSE()</a> </li>
        </ul>
-
-       <hr>
-
-       <center>
-               <h2>
-                       <a name="manpage">Man page</a>
-               </h2>
-       </center>
-
-       @MAN_PAGE@
-
 </body> </html>
 
DSS - dyadic snapshot scheduler