Free the templating for the web page from autoconf, for flexibility.

diff --git a/configure.ac b/configure.ac
index 488b2c003cd1a57048b5d9e3e01af90c49df6cda..9683bf8424e57428b9828b510aa8837dc21b97e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,8 +76,8 @@ INCLUDE_HIDDEN_FROM_AUTOMAKE="include"
 AC_SUBST(PACKAGE_VERSION)
 AC_SUBST(INCLUDE_HIDDEN_FROM_AUTOMAKE)
 
-AC_CONFIG_FILES([Makefile:buildaux/Makefile.in coopt.sh:src/cooptsh.in host.mak:buildaux/hostmak.in website/index.html])
-AC_OUTPUT(,[chmod a-w website/index.html])
+AC_CONFIG_FILES([Makefile:buildaux/Makefile.in coopt.sh:src/cooptsh.in host.mak:buildaux/hostmak.in])
+AC_OUTPUT()
 # After the output, chmod coopt.sh to be executable.
 chmod a+x coopt.sh
 

diff --git a/website/Makefile b/website/Makefile
index d7882ede061ad2feeed481fff03eea9862ca007f..6e3c7e45f9362d340decee6c32d6bfd2cbf5966e 100644 (file)
--- a/website/Makefile
+++ b/website/Makefile
@@ -3,7 +3,14 @@
 all: README.html NEWS.html BUGS.html THEORY.html ../doc/ick.htm ../doc/intercal.ps
 
 clean:
-       rm -f README.html NEWS.html BUGS.html THEORY.html
+       rm -f README.html NEWS.html BUGS.html THEORY.html index.html
+
+VERSION=$(shell cd .. && make echo-version)
+
+index.html: index.html
+       @rm -f index.html
+       @(echo "<!-- Generated file -- do not hand-hack! -->"; echo "define(PACKAGE_VERSION, ${VERSION})" | m4 - index.html.in) >index.html
+       @chmod a-w index.html 
 
 README.html: ../README
        asciidoc - <../README >README.html

diff --git a/website/index.html.in b/website/index.html.in
index baea8b0375b17a45d9c4f4b493f199564d6f315f..aacfdd29ac7e74816bf161a941fef946d8dd2f3c 100644 (file)
--- a/website/index.html.in
+++ b/website/index.html.in
@@ -113,7 +113,7 @@ unknown.</p>
 completed.  Have patience, the project is presently reorganizing after
 the move to git.</p>
 
-<!-- Test expansion of @PACKAGE_VERSION@ -->
+<!-- Test expansion of PACKAGE_VERSION -->
 
 <h2>Other Tools</h2>
 
@@ -221,7 +221,7 @@ stimulating.</p>
 </html>
 <!--
 Local Variables:
-compile-command: "(cp index.html ..; cd ~/WWW; upload intercal/index.html)"
+compile-command: "upload"
 End:
 -->