change hetmet directory to compiler/hetmet/, update to new git url

diff --git a/.gitmodules b/.gitmodules
index 162e65d..ee9771b 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "compiler/coq"]
-       path = compiler/coq
-       url = http://git.megacz.com/coq-garrows.git
+[submodule "compiler/hetmet"]
+       path = compiler/hetmet
+       url = http://git.megacz.com/coq-hetmet.git

diff --git a/compiler/coq b/compiler/coq
deleted file mode 160000 (submodule)
index 11f5f9e..0000000
--- a/compiler/coq
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 11f5f9e762626272e8d339d8e6edad514e536041

diff --git a/ghc.mk b/ghc.mk
index f818482..738b5ca 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -1215,12 +1215,12 @@ phase_1_builds: $(PACKAGE_DATA_MKS)
 # -----------------------------------------------------------------------------
 # Support for writing GHC passes in Coq
 
 # -----------------------------------------------------------------------------
 # Support for writing GHC passes in Coq
 

-compiler/coq/Makefile:
-       git submodule update --init compiler/coq
-       cd compiler/coq/; git checkout master
-compiler/coq/build/CoqPass.hs: compiler/coq/Makefile $(wildcard compiler/coq/src/*.v) $(wildcard compiler/coq/src/*.hs)
-       cd compiler/coq; make
-compiler/stage1/build/CoqPass.hs: compiler/coq/build/CoqPass.hs
-       cp compiler/coq/build/CoqPass.hs $@
-compiler/stage2/build/CoqPass.hs: compiler/coq/build/CoqPass.hs
-       cp compiler/coq/build/CoqPass.hs $@
+compiler/hetmet/Makefile:
+       git submodule update --init compiler/hetmet
+       cd compiler/hetmet/; git checkout master
+compiler/hetmet/build/CoqPass.hs: compiler/hetmet/Makefile $(wildcard compiler/hetmet/src/*.v) $(wildcard compiler/hetmet/src/*.hs)
+       cd compiler/hetmet; make
+compiler/stage1/build/CoqPass.hs: compiler/hetmet/build/CoqPass.hs
+       cp compiler/hetmet/build/CoqPass.hs $@
+compiler/stage2/build/CoqPass.hs: compiler/hetmet/build/CoqPass.hs
+       cp compiler/hetmet/build/CoqPass.hs $@