Changed binary name to civcc

Makefile

@@ -1,4 +1,5 @@
-RESULT := civicc
+# Config for OCamlMakefile
+RESULT := civcc
 GLOBALS := types globals stringify util
 PHASES := load parse print desug context typecheck dimreduce boolop constprop \
 	unroll index assemble peephole output
@@ -9,15 +10,10 @@ SOURCES := $(addsuffix .mli,$(GLOBALS)) $(addsuffix .ml,$(GLOBALS)) \
 PRE_TARGETS := types.ml $(addsuffix .cmi,$(GLOBALS))
 LIBS := str unix
 
-# Set debugging flag to enable exception backtraces for OCAMLRUNPARAM=b
-OCAMLFLAGS := -g
-
-OCAMLYACC := menhir
-YFLAGS := --infer --explain
-
+# Other config
 CIVAS := bin32/civas
 CIVVM := bin32/civvm
-CIVCC := ./civicc
+CIVCC := ./$(RESULT)
 
 DIST_TGT := civicaml.tar.gz
 DIST_FILES := $(RESULT) $(SOURCES) Makefile OCamlMakefile README.md test bin32 \
@@ -25,14 +21,19 @@ DIST_FILES := $(RESULT) $(SOURCES) Makefile OCamlMakefile README.md test bin32 \
 
 TESTSUITE_TGT := testsuite.tar.gz
 
-.PHONY: all check dist testsuite myclean
+# Set debugging flag to enable exception backtraces for OCAMLRUNPARAM=b
+OCAMLFLAGS := -g
+
+OCAMLYACC := menhir
+YFLAGS := --infer --explain
 
+.PHONY: all check dist testsuite myclean
 
 all: native-code
 
 clean:: myclean
 
-# The Types module needs an implementation to stop ocamlc from complaining
+# The Types module needs an implementation file to stop ocamlc from complaining
 types.ml: types.mli
 	cp $< $@
 

README.md

@@ -6,8 +6,8 @@ CiviCaml is a compiler for the CiviC language, written in OCaml.
 
 Documentation
 -------------
-`make doc` generates HTML documentation, which is accessible through
-doc/civicc.index.html.
+`make htdoc` generates HTML documentation, which is accessible through
+doc/civcc/html/index.html.
 
 The coding style adheres to
 http://wiki.xen.org/wiki/OCaml_Best_Practices_for_Developers#Use_of_open.

phases/output.mli

@@ -5,7 +5,7 @@
     code is printed to [stdout]. This allows for using the compiler with UNIX
     pipes, since other output is written to [stderr] and the {!Load} phase can
     also read from [stdin]:
-    {v ./civicc < foo.cvc > foo.s v}
+    {v ./civcc < foo.cvc > foo.s v}
 
     This phase has [Assembly] as input and outputs [Empty].
     *)

test/run.bash

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 CIVAS=${CIVAS-../bin32/civas}
 CIVVM=${CIVVM-../bin32/civvm}
-CIVCC=${CIVCC-../civicc}
+CIVCC=${CIVCC-../civcc}
 CFLAGS=${CFLAGS-}
 RUN_FUNCTIONAL=${RUN_FUNCTIONAL-1}