Updates for new web pages, todo list.

1 files changed, 10 insertions, 8 deletions

diff --git a/Makefile.devel b/Makefile.devel
index 1f283a54..62bab01f 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -50,10 +50,12 @@
 
 
 # Release tag.  For pre-releases.  Watch out with
-# substitution in tag target below, which edits
-# html/download.html
+# substitution in tag target below, which edits $(DOWNLOADHTML)
 PRERELEASE_TAG=2.1pre$(shell date "+%y%m%d")
 
+# html/download.phtml
+DOWNLOADHTML=download.phtml
+
 
 # This is used for full releases to control the tag name
 # and distribution name.  No editing of html is done
@@ -95,7 +97,7 @@ TAR=tar
 DEVELMAKE=make -f Makefile.devel
 
 # Files not to include the distribution area or tarball 
-NONDISTFILES=.cvsignore */.cvsignore html etc Makefile.devel doc/notes.txt images/*.xcf images/notes.txt images/gimp images/Makefile isa/wip.ML plastic/ isar/
+NONDISTFILES=.cvsignore */.cvsignore html etc Makefile.devel doc/notes.txt images/*.xcf images/notes.txt images/gimp images/Makefile isa/wip.ML html/notes.txt plastic/ isar/ 
 
 # Files not to include in the distribution tarball
 IGNOREDFILES=doc/ProofGeneral.dvi Makefile.devel todo isa/wip.ML
@@ -218,7 +220,7 @@ images:	FORCE
 ##
 ## tag:    tag the CVS sources of working directory with CVS_RELEASENAME,
 ##	   set version stamp in proof-site.el and ProofGeneral.spec 
-##         to VERSION, and edit download.html if VERSION matches 
+##         to VERSION, and edit $(DOWNLOADHTML) if VERSION matches 
 ##	   PRERELEASE_TAG.
 ##
 tag:		
@@ -227,18 +229,18 @@ tag:
 	@echo "*************************************************"
 	if [ -n "`cvs -n -q update`" ]; then exit 1; fi
 # Tag proof-site.el and ProofGeneral.spec
-	(cd generic; mv proof-site.el proof-site.el.old; sed -e 's/defconst proof-version \".*\"/defconst proof-version \"Proof General, Version $(VERSION) released by da,tms. Email proofgen@dcs.ed.ac.uk.\"/g' proof-site.el.old > proof-site.el; rm proof-site.el.old)
+	(cd generic; mv proof-site.el proof-site.el.old; sed -e 's/defconst proof-version \".*\"/defconst proof-version \"Proof General, Version $(VERSION) released by da. Email proofgen@dcs.ed.ac.uk.\"/g' proof-site.el.old > proof-site.el; rm proof-site.el.old)
 	(cd etc; mv ProofGeneral.spec ProofGeneral.spec.old; sed -e 's/Version:.*$$/Version:	$(VERSION)/g' ProofGeneral.spec.old > ProofGeneral.spec; rm ProofGeneral.spec.old)
-# Edit download.html only for prereleases.
+# Edit $(DOWNLOADHTML) only for prereleases.
 # Careful: the sed command below relies on previous value of PRERELEASE_TAG.
 	if [ $(PRERELEASE_TAG) = $(VERSION) ]; then \
-	  (cd html; mv download.html download.html.old; sed -e 's|ProofGeneral-2\.1pre......|ProofGeneral-$(PRERELEASE_TAG)|g' download.html.old > download.html; rm download.html.old) \
+	  (cd html; mv $(DOWNLOADHTML) $(DOWNLOADHTML).old; sed -e 's|ProofGeneral-2\.1pre......|ProofGeneral-$(PRERELEASE_TAG)|g' $(DOWNLOADHTML).old > $(DOWNLOADHTML); rm $(DOWNLOADHTML).old) \
 	fi
 # This hack to SOURCE: name is only needed because we have an obsolete version
 # of rpm installed on standard machines at dcs.ed, and we have to build with
 # that version.  Otherwise we could use the %{version} macro in the spec file.
 	(cd etc; mv ProofGeneral.spec ProofGeneral.spec.old; sed -e 's/ProofGeneral-.*.tar.gz/$(RELEASENAMETARGZ)/g' ProofGeneral.spec.old > ProofGeneral.spec; rm ProofGeneral.spec.old)
-	cvs commit -m"Set version tag for new release." generic/proof-site.el html/download.html etc/ProofGeneral.spec
+	cvs commit -m"Set version tag for new release." generic/proof-site.el html/$(DOWNLOADHTML) etc/ProofGeneral.spec
 	cvs tag "$(CVS_RELEASENAME)"
 
 ############################################################