16 files changed, 25 insertions, 27 deletions
diff --git a/README.txt b/README.txt
index 7610d02..c2aa43a 100644
--- a/README.txt
+++ b/README.txt
@@ -56,16 +56,12 @@ Selling points include:
 > }
 
 ####### Versions & Self-Hosting #######
-There are three versions:
+There are two versions:
 
-    - `py_version` is written in Python and is the oldest & slowest. It does
-      not support the latest syntax features. It's designed to infer template
-      locations, so you can write just "foo[T]" instead of, say, "foo![T]".
+    - `gamma_version` is written in Gamma
 
-    - `c_version` is written in C and supports all the current features.
-
-    - `gamma_version` is written in Gamma and supports all the current
-      features. It's also faster for projects with many templates.
+    - `c_version` is extracted from and equivalent to the Gamma version, but
+      does not require a Gamma compiler
 
 The Gamma-in-Gamma version requires an existing Gamma compiler. It is currently
 set up to use the result of the C version, hence you must build like so:
diff --git a/c_version/10.c b/c_version/10.c
index 86c6eb0..b4aacc8 100755
--- a/c_version/10.c
+++ b/c_version/10.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/10.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/10.unfake.c"
        
 
 
diff --git a/c_version/11.c b/c_version/11.c
index 61554d2..934b99c 100755
--- a/c_version/11.c
+++ b/c_version/11.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/11.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/11.unfake.c"
        
 
 
diff --git a/c_version/12.c b/c_version/12.c
index 9fc0a84..cac9b43 100755
--- a/c_version/12.c
+++ b/c_version/12.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/12.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/12.unfake.c"
        
 
 
diff --git a/c_version/13.c b/c_version/13.c
index 85a5e6d..0c5f300 100755
--- a/c_version/13.c
+++ b/c_version/13.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/13.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/13.unfake.c"
        
 
 
diff --git a/c_version/14.c b/c_version/14.c
index c21e63b..681f6c1 100755
--- a/c_version/14.c
+++ b/c_version/14.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/14.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/14.unfake.c"
        
 
 
diff --git a/c_version/15.c b/c_version/15.c
index d8e7323..ee081d2 100755
--- a/c_version/15.c
+++ b/c_version/15.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/15.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/15.unfake.c"
        
 
 
diff --git a/c_version/16.c b/c_version/16.c
index 3ef8421..2947004 100755
--- a/c_version/16.c
+++ b/c_version/16.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/16.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/16.unfake.c"
        
 
 
diff --git a/c_version/17.c b/c_version/17.c
index dd10f31..da8ba59 100755
--- a/c_version/17.c
+++ b/c_version/17.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/17.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/17.unfake.c"
        
 
 
diff --git a/c_version/6.c b/c_version/6.c
index 515ff1a..270d53c 100755
--- a/c_version/6.c
+++ b/c_version/6.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/6.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/6.unfake.c"
        
 
 
diff --git a/c_version/7.c b/c_version/7.c
index 9a5ba7e..5b8f045 100755
--- a/c_version/7.c
+++ b/c_version/7.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/7.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/7.unfake.c"
        
 
 
diff --git a/c_version/8.c b/c_version/8.c
index 88c8efb..99565ba 100755
--- a/c_version/8.c
+++ b/c_version/8.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/8.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/8.unfake.c"
 
 
 
diff --git a/c_version/9.c b/c_version/9.c
index 4729645..91ee3aa 100755
--- a/c_version/9.c
+++ b/c_version/9.c
@@ -1,5 +1,5 @@
 
-#line 1 "/tmp/gamma.XksNqZ/9.unfake.c"
+#line 1 "/tmp/gamma.3vC7ro/9.unfake.c"
        
 
 
diff --git a/c_version/Makefile b/c_version/Makefile
index dd4eba9..1941cc0 100644
--- a/c_version/Makefile
+++ b/c_version/Makefile
@@ -1,2 +1,3 @@
-gc: *.c
-	cc -O3 *.c -o gc
+build/gc: *.c
+	@mkdir -p build
+	cc -O3 *.c -o build/gc
diff --git a/self_hosting/Makefile.gamma_to_c b/self_hosting/Makefile.gamma_to_c
index dd4eba9..1941cc0 100644
--- a/self_hosting/Makefile.gamma_to_c
+++ b/self_hosting/Makefile.gamma_to_c
@@ -1,2 +1,3 @@
-gc: *.c
-	cc -O3 *.c -o gc
+build/gc: *.c
+	@mkdir -p build
+	cc -O3 *.c -o build/gc
diff --git a/self_hosting/bootstrap.sh b/self_hosting/bootstrap.sh
index 33a02b4..5825b22 100755
--- a/self_hosting/bootstrap.sh
+++ b/self_hosting/bootstrap.sh
@@ -6,12 +6,12 @@ C_VERSION=../c_version
 GAMMA_VERSION=../gamma_version
 
 echo "------------- Using GCC to build the C version -------------"
-rm -rf $C_VERSION/gc
+rm -rf $C_VERSION/build/gc
 make -C $C_VERSION
 
 echo "------------- Using the C version to build the Gamma version -------------"
 rm -rf $GAMMA_VERSION/build
-GC=$(pwd)/$C_VERSION/gc make -C $GAMMA_VERSION
+GC=$(pwd)/$C_VERSION/build/gc make -C $GAMMA_VERSION
 
 echo "------------- Using the Gamma version to build the Gamma version -------------"
 rm -rf self_hosted_version
@@ -28,4 +28,4 @@ cp Makefile.gamma_to_c gamma_to_c_version/Makefile
 echo "------------- Building the gamma_to_c version with GCC -------------"
 make -C gamma_to_c_version
 
-echo "------------- Done! See gamma_to_c_version/gc -------------"
+echo "------------- Done! See gamma_to_c_version/build/gc -------------"