From ca6198dc98693face400d25364d21ae9bedf12df Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Mon, 12 Nov 2007 16:17:04 +0000
Subject: [PATCH] Use configure to produce a gfc script with the correct path
 to gf3. NOTE: you need to re-run autoconf after pulling this patch.

---
 bin/gfc          |  3 ---
 src/Makefile     |  2 ++
 src/configure.ac |  2 +-
 src/gfc.in       | 25 +++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)
 delete mode 100644 bin/gfc
 create mode 100644 src/gfc.in

diff --git a/bin/gfc b/bin/gfc
deleted file mode 100644
index 5b4242a6c..000000000
--- a/bin/gfc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-GFBIN=/usr/local/bin/gf3
-exec $GFBIN --batch ${1+"$@"}
diff --git a/src/Makefile b/src/Makefile
index 13723371d..b7970d3f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -194,6 +194,8 @@ tools/$(GF_DOC_EXE): tools/GFDoc.hs
 	$(GHMAKE) $(GHCOPTFLAGS) -o $@ $^
 
 gfc: gf3
+	cp -f gfc ../bin/
+	chmod a+x ../bin/gfc
 
 gfi: gf3
 
diff --git a/src/configure.ac b/src/configure.ac
index 3b8cc5d24..adca519b3 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ(2.53)
 
 AC_REVISION($Revision: 1.26 $)
 
-AC_CONFIG_FILES([config.mk jgf gfeditor])
+AC_CONFIG_FILES([config.mk gfc jgf gfeditor])
 
 AC_CANONICAL_HOST
 
diff --git a/src/gfc.in b/src/gfc.in
new file mode 100644
index 000000000..05addb2cb
--- /dev/null
+++ b/src/gfc.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+prefix="@prefix@"
+
+case "@host@" in
+      *-cygwin)
+          prefix=`cygpath -w "$prefix"`;;
+esac
+
+exec_prefix="@exec_prefix@"
+GF_BIN_DIR="@bindir@"
+GF_DATA_DIR="@datadir@/GF-@PACKAGE_VERSION@"
+
+GFBIN="$GF_BIN_DIR/gf3"
+
+if [ ! -x "${GFBIN}" ]; then
+   GFBIN=`which gf3`
+fi
+
+if [ ! -x "${GFBIN}" ]; then
+    echo "gf3 not found."
+    exit 1
+fi
+
+exec $GFBIN --batch "$@"