s/URL/PROJECT_WEBSITE.

Because the term URL appears in index.html.m4 and misma.suite.m4,
where it should *not* be expanded. Currently, we work around this by
quoting the term. This is easy to miss, so...

diff --git a/Makefile b/Makefile
index 76d4685eb9c77fe91183326074931b7166097d94..404453e9cfeb0b0e97e704648b01da74d15f12db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ SLOGAN := the minimal snapshot manager
 AUTHOR := Andre Noll
 EMAIL := maan@tuebingen.mpg.de
 COPYRIGHT_YEAR := 2024
-URL := https://people.tuebingen.mpg.de/maan/$(PACKAGE)/
+PROJECT_WEBSITE := https://people.tuebingen.mpg.de/maan/$(PACKAGE)/
 CLONE_URL := https://git.tuebingen.mpg.de/$(PACKAGE)
 GITWEB_URL := https://git.tuebingen.mpg.de/$(PACKAGE).git
 HOME_URL := https://people.tuebingen.mpg.de/maan/
@@ -55,7 +55,7 @@ XCPPFLAGS += -DCOPYRIGHT_YEAR='"$(COPYRIGHT_YEAR)"'
 XCPPFLAGS += -DPACKAGE='"$(PACKAGE)"'
 XCPPFLAGS += -DAUTHOR='"$(AUTHOR)"'
 XCPPFLAGS += -DEMAIL='"$(EMAIL)"'
-XCPPFLAGS += -DURL='"$(URL)"'
+XCPPFLAGS += -DPROJECT_WEBSITE='"$(PROJECT_WEBSITE)"'
 XCPPFLAGS += -DCLONE_URL='"$(CLONE_URL)"'
 XCPPFLAGS += -DGITWEB_URL='"$(GITWEB_URL)"'
 XCPPFLAGS += -DHOME_URL='"$(HOME_URL)"'
@@ -150,7 +150,7 @@ define M4_CMD =
                -D "PACKAGE=$(PACKAGE)" \
                -D "SLOGAN=$(SLOGAN)" \
                -D "EMAIL=$(EMAIL)" \
-               -D "URL=$(URL)" \
+               -D "PROJECT_WEBSITE=$(PROJECT_WEBSITE)" \
                -D "CLONE_URL=$(CLONE_URL)" \
                -D "GITWEB_URL=$(GITWEB_URL)" \
                -D "HOME_URL=$(HOME_URL)" \
@@ -224,7 +224,7 @@ $(DESCRIPTION3)
 
 Resources
 ~~~~~~~~~
-|      web page: $(URL)
+|      web page: $(PROJECT_WEBSITE)
 |      git clone URL: $(CLONE_URL)
 |      gitweb: $(GITWEB_URL)
 |      author's home page: $(HOME_URL)

diff --git a/index.html.m4 b/index.html.m4
index 47e8c796e38aac2b4c8809c6327baab01dfa0b9d..daf5a03d8a50312036039c29fd65bc8cd0ccf497 100644 (file)
--- a/index.html.m4
+++ b/index.html.m4
@@ -102,7 +102,7 @@ ifelse(MODE(), `svg', `SVG() m4exit')
                to snapshot them with PACKAGE().
 
                <h3> Resources </h3> <ul>
-                       <li> Clone `URL': <code>CLONE_URL()</code> </li>
+                       <li> Clone URL: <code>CLONE_URL()</code> </li>
                        <li> <a href="GITWEB_URL()">Gitweb</a> </li>
                        <li> <a href="PACKAGE().8.html">manual page</a> </li>
                        <li> The author's <a href="HOME_URL()">home page</a> </li>

diff --git a/misma.c b/misma.c
index 34040baa121030957193f042a9ed1213a0570793..08022103822afa3024be6c7e5a3516f4febcdff7 100644 (file)
--- a/misma.c
+++ b/misma.c
@@ -1494,7 +1494,7 @@ static void handle_version_and_help(void)
                        "This is free software: you are free to change and redistribute it.\n"
                        "There is NO WARRANTY, to the extent permitted by law.\n"
                        "\n"
-                       "Web page: " URL "\n"
+                       "Web page: " PROJECT_WEBSITE "\n"
                        "Clone URL: " CLONE_URL "\n"
                        "Gitweb: " GITWEB_URL "\n"
                        "Author's Home Page: " HOME_URL "\n"

diff --git a/misma.suite.m4 b/misma.suite.m4
index 6a95dcb7c0df74a04ef381cb00f5825102142599..fd64e18e0ccc3520046012418c5660346c00b54a 100644 (file)
--- a/misma.suite.m4
+++ b/misma.suite.m4
@@ -586,10 +586,10 @@
        There is NO WARRANTY, to the extent permitted by law.
        .P
        Web page:
-       .UR URL()
+       .UR PROJECT_WEBSITE()
        .UE
        .br
-       Git clone `URL':
+       Git clone URL:
        .UR CLONE_URL()
        .UE
        .br