From 7c4072d013e6f20cf4c8aeb1c7de794d7d732449 Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Tue, 10 Aug 2004 12:39:38 +0000
Subject: [PATCH] for www

---
 doc/gf-index.html         |  73 +++------------------
 download/gf-download.html | 135 ++++++++++++++++++++++++++++++++++++++
 src/Makefile              |   8 +--
 3 files changed, 147 insertions(+), 69 deletions(-)
 create mode 100644 download/gf-download.html

diff --git a/doc/gf-index.html b/doc/gf-index.html
index 14bf389f2..37c50f4ef 100644
--- a/doc/gf-index.html
+++ b/doc/gf-index.html
@@ -21,63 +21,7 @@ August 10, 2004.
 <b>August 10, 2004. GF 2.0 now released</b>.
 Here are the <a
 href="doc/gf2-highlights.html">highlights</a>.
-Software available on the <a href="download">Download Page</a>.
-
-<p>
-
-<font size=-2>
-
-<h3>Older news</h3>
-
-April 2, 2004. GF 2.0 beta version now released.
-Here are the <a href="http://www.cs.chalmers.se/%7Eaarne/GF/GF2/gf2-highlights.html">highlights</a>.
-Here is a <a href="http://www.cs.chalmers.se/%7Eaarne/GF/GF2/gf2-beta.tgz">source package</a>
-which also includes documentation and example grammars.
-Comments and suggestions welcome!
-
-<br>
-
-June 25, 2003. GF 1.2 released with updated binaries, sources,
-and grammar packages. Here are the <a href="http://www.cs.chalmers.se/%7Eaarne/GF/doc/gf-1.2.html">highlights</a>.
-
-<br>
-
-May 25, 2003.
-A new version of the <a href="http://www.cs.chalmers.se/%7Eaarne/GF/Tutorial">grammarian's tutorial</a>, to be used in the
-<a href="http://www.logic.at/esslli03/">ESSLLI summer school</a>.
-
-<br>
-
-March 27, 2003. 
-<a href="http://www.cs.chalmers.se/%7Ekrijo/gramlets.html">Gramlets</a>:
-GF grammars compiled to Java applets. Try out a GF editor demo.
-
-<br>
-
-March 27, 2003. GF 1.1 released with updated binaries, sources,
-and grammar packages. Here are the <a href="http://www.cs.chalmers.se/%7Eaarne/GF/doc/gf-1.1.html">highlights</a>.
-Version 1.0 is still available as source package.
-
-
-<br>
-
-November 1, 2002. Started web page on
-<a href="http://129.16.225.78/aarne/GF/resource/">resource grammars</a>.
-
-<br>
-November 1, 2002. Get GF Zaurus applications 
-<a href="http://129.16.225.78/aarne/GF/zaurus/">here</a>.
-
-<br>
-
-September 6, 2002. GF on Sharp Zaurus SL5500 PDA:
-<a href="http://www.cs.chalmers.se/%7Eaarne/GF/doc/zaurus2.jpg">picture</a>.
-This was made possible by an excellent
-<a href="http://www.killefiz.de/zaurus/showdetail.php?app=430">Hugs port</a>
-for Zaurus. To learn more about Zaurus, read this
-<a href="http://linux.oreillynet.com/pub/a/linux/2002/05/23/zaurus.html">
-review</a>.
-</font>
+Software available on the <a href="download/gf-download.html">Download Page</a>.
 
 
 </p><h2>What is GF?</h2>
@@ -148,7 +92,7 @@ but they can also be useful for language training.
 
 GF is available precompiled for
 several platforms: Linux, Mac OS X, Microsoft Windows, and Sun OS.
-For more information, see the <a href="download">Download Page</a>.
+For more information, see the <a href="download/gf-download.html">Download Page</a>.
 
 
 <h2>Source code</h2>
@@ -167,7 +111,7 @@ The platform-independent graphical user interface is written in
 Here is a 
 <a href="gf-src.tgz">GF source package</a>, which includes a Makefile
 for different platforms and Haskell compilers.
-The <a href="download">Download Page</a> gives more information on
+The <a href="download/gf-download.html">Download Page</a> gives more information on
 compiler requirements.
 
 </p><p>
@@ -242,18 +186,17 @@ in Vienna 2003.
 
 <h2>Miscellaneous</h2>
 
-<ul>
-  <li>
-
-<a href="gf-grammars.tgz">
-Package of example GF grammars</a>
-
 
 </li><li>
 <a href="http://www.cs.chalmers.se/%7Ekrijo/gramlets.html">Gramlets</a>:
 GF grammars compiled to Java applets.
 
 
+</li><li>
+<a href="http://www.cs.chalmers.se/~aarne/GF1">
+Previous version of the GF Home Page</a>
+last updated for GF, Version 1.2, 2003.
+
 </li><li>
 <a href="http://www.xrce.xerox.com/competencies/content-analysis/past-projects/gf/home.en.html">
 The GF Xerox Home Page</a>
diff --git a/download/gf-download.html b/download/gf-download.html
new file mode 100644
index 000000000..f71668137
--- /dev/null
+++ b/download/gf-download.html
@@ -0,0 +1,135 @@
+<html><head><title>GF Download</title></head> 
+
+<body bgcolor="#ffffff" text="#000000">
+<center>
+<img src="../doc/gf-logo.gif">
+
+<h1>Grammatical Framework Download and Install</h1>
+
+<p>
+
+GF 2.0
+<br>
+August 10, 2004
+</center>
+
+<p>
+
+<b>Bonus</b>: install the
+<a href="http://www.speech.cs.cmu.edu/flite/doc/">
+Flite Speech Synthesizer</a>
+to get the Speak Aloud command (<tt>sa</tt>).
+
+
+
+<h2>Linux</h2>
+
+<h4>Requirements</h4>
+
+RedHat &gt;7.1 and Mandrake &gt;9.2 have been tested.
+
+
+<h4>Download</h4>
+
+<a href="GF-2.0.rpm"><tt>GF-2.0.rpm</tt></a>, binary RPM
+
+<p>
+
+<a href="GF-2.0.tgz"><tt>GF-2.0-linux.tgz</tt></a>, tar package with
+binaries, Java classes, and example grammars
+
+
+
+
+<h4>Install</h4>
+
+Binary RPM:
+<pre>
+  rpm -i GF-2.0.rpm
+</pre>
+Tar package
+<pre>
+  tar xvfz GF-2.0-linux.tgz
+</pre>
+
+
+<h4>Run</h4>
+
+Without the GUI:
+<pre>
+  gf
+</pre>
+With the GUI:
+<pre>
+  jgf
+</pre>
+
+
+</p><h2>Macintosh</h2>
+
+Binary coming soon; until then <a href="#src">compile from source</a>.
+
+
+<h2>Microsoft Windows</h2>
+
+Binary coming soon; until then <a href="#src">compile from source</a>.
+
+
+</p><h2>Solaris</h2>
+
+Binary coming soon; until then <a href="#src">compile from source</a>.
+
+
+
+
+<h2><a name=src>Source package</a></h2>
+
+<h4>Requirements</h4>
+
+Linux, Windows, Mac OS X, or Solaris
+
+<p>
+
+<a href="http://www.haskell.org/ghc/">GHC</a> 
+(Glasgow Haskell Compiler)
+
+<p>
+
+For the GUI: <a href="http://www.java.sun.com/">Java</a> 1.4
+
+
+<h4>Download</h4>
+
+<a href="GF-2.0.tgz"><tt>GF-2.0.tgz</tt></a>, 
+source and grammar package
+
+<h4>Compile and install</h4>
+
+Uncompress:
+<pre>
+  tar xvfz GF-2.0.tgz
+</pre>
+Follow instructions in <tt>GF-2.0/INSTALL</tt>
+
+
+<h4>Run</h4>
+
+Without the GUI:
+<pre>
+  gf
+</pre>
+With the GUI:
+<pre>
+  jgf
+</pre>
+
+
+<hr>
+
+<a href="../index.html">Back to the GF Home Page</a>.
+
+<p>
+
+Last updated August 10, 2004.
+
+</p></body></html>
diff --git a/src/Makefile b/src/Makefile
index 0d2a1b615..c9e190c89 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -84,7 +84,7 @@ distclean: clean
 	-rm -f java/gf-java.jar jgf
 	-rm -f util/gfdoc
 	-rm -f config.status config.mk config.log
-	-rm -f *.tar.gz *.zip
+	-rm -f *.tgz *.zip
 	-rm -rf $(DIST_DIR) $(BIN_DIST_DIR)
 
 hugs:
@@ -123,11 +123,11 @@ dist:
 	find $(DIST_DIR) -name .cvsignore -exec rm -f {} ';'
 	cd $(DIST_DIR)/grammars && sh mkLib.sh
 	cd $(DIST_DIR) && rm -rf $(NOT_IN_DIST)
-	gtar -zcf $(DIST_DIR).tar.gz $(DIST_DIR)
+	gtar -zcf $(DIST_DIR).tgz $(DIST_DIR)
 	rm -rf $(DIST_DIR)
 
 rpm: dist
-	rpmbuild -ta $(DIST_DIR).tar.gz
+	rpmbuild -ta $(DIST_DIR).tgz
 
 binary-dist: 
 	rm -rf $(BIN_DIST_DIR)
@@ -141,7 +141,7 @@ binary-dist:
 	$(INSTALL) -m 0644 ../README ../LICENSE $(BIN_DIST_DIR)
 	$(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL
 	$(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile
-	gtar -zcf GF-$(PACKAGE_VERSION)-$(host).tar.gz $(BIN_DIST_DIR)
+	gtar -zcf GF-$(PACKAGE_VERSION)-$(host).tgz $(BIN_DIST_DIR)
 	rm -rf $(BIN_DIST_DIR)
 
 install-gf: