From 87fe551a579089bbe2af3c53d709446d68816b2d Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 12 Sep 2007 09:12:42 +0000
Subject: [PATCH] install instructions updated

---
 README             |  9 ++++++---
 src/INSTALL.binary | 26 +++++++++++++++++++++++---
 src/Makefile       |  3 ++-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/README b/README
index f64ba6488..6de32b197 100644
--- a/README
+++ b/README
@@ -19,13 +19,16 @@ generic grammar processor performs various tasks with the grammars:
     * random generation
     * syntax editing 
 
-GF particularly addresses two aspects of grammars:
+GF particularly addresses four aspects of grammars:
 
     * multilinguality (parallel grammars for different languages)
     * semantics (semantic conditions of well-formedness, semantic 
       properties of expressions) 
+    * grammar engineering (modularity, abstractions, libraries)
+    * embeddability in programs written in other languages (C,C++,
+      Haskell, Java, JavaScript)
 
+INSTALLATION of binary distribution: see INSTALL
 
-INSTALLATION
-
+INSTALLATION of source distribution:
 See src/INSTALL for installation instructions.
diff --git a/src/INSTALL.binary b/src/INSTALL.binary
index e9b8f0295..ef62b24af 100644
--- a/src/INSTALL.binary
+++ b/src/INSTALL.binary
@@ -2,9 +2,13 @@ Installing a binary GF distribution:
 
 1. Untar the distribution file:
 
-   $ gtar -zxf GF-2.0-[host].tar.gz
+   $ gtar -zxf GF-2.8-[host].tar.gz
 
-2. Run configure:
+2. Go to the created directory:
+
+   $ cd GF-2.8-[host]
+
+3. Run configure:
 
    $ ./configure
 
@@ -13,6 +17,22 @@ Installing a binary GF distribution:
 
    $ ./configure --prefix=/usr
 
-3. Install:
+4. Install:
 
    $ make install
+
+If the above procedure should fail (e.g. you don't have "make" available), you
+can do a manual install:
+
+  1. Untar the package and go to the GF directory, as 1-2 above.
+
+  2. The executable is the file "gf". You may want to move it somewhere
+     else, e.g. /usr/local/bin
+
+  3. The libraries are in the subdirectory "lib/". It is recommended to
+     create an environment variable GF_LIB_PATH pointing to that directory.
+     In the bash shell, you do
+
+     $ export GF_LIB_PATH=[your gf directory]/lib
+
+
diff --git a/src/Makefile b/src/Makefile
index 8bb19413c..4f58083c4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -235,6 +235,7 @@ rpm: dist
 binary-dist: 
 	rm -rf $(BIN_DIST_DIR)
 	mkdir $(BIN_DIST_DIR)
+	mkdir $(BIN_DIST_DIR)/lib
 	./configure --host="$(host)" --build="$(build)"
 	$(MAKE) all
 	$(INSTALL) ../bin/$(GF_EXE) tools/$(GF_DOC_EXE) $(BIN_DIST_DIR)
@@ -246,7 +247,7 @@ binary-dist:
 	$(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL
 	$(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile
 	$(MAKE) lib
-	$(TAR) -C $(BIN_DIST_DIR) -zxf ../lib/compiled.tgz
+	$(TAR) -C $(BIN_DIST_DIR)/lib -zxf ../lib/compiled.tgz
 	$(TAR) -zcf GF-$(PACKAGE_VERSION)-$(host).tgz $(BIN_DIST_DIR)
 	rm -rf $(BIN_DIST_DIR)