Merge branch 'v86' into v86FullNames

Author: aa755

Makefile

@@ -1,22 +1,22 @@
 .PHONY: coq clean
 
 coq:: Makefile.coq
-	COQBIN=$(COQBIN) COQDEP=$(COQBIN)coqdep ZDEBUG=-bin-annot $(MAKE) -f Makefile.coq
+	$(MAKE) -f Makefile.coq
 
 src/paramcoq_mod.ml: src/paramcoq.mllib
 	sed -e "s/\([^ ]\{1,\}\)/let _=Mltop.add_known_module\"\1\" /g" $< > $@
 	echo "let _=Mltop.add_known_module\"paramcoq\"" >> $@
 
 Makefile.coq: Make.cfg src/paramcoq_mod.ml
-	$(COQBIN)coq_makefile -f Make.cfg -o Makefile.coq
-	sed -i 's/$$(COQDEP) $$(OCAMLLIBS)/$$(COQDEP) $$(OCAMLLIBS) -c/' Makefile.coq
+	coq_makefile -f Make.cfg -o Makefile.coq
 
 clean:: Makefile.coq
 	$(MAKE) -f Makefile.coq clean
-	rm -f src/paramcoq_mod.ml
 
 distclean:
 	rm -f Makefile.coq Makefile.coq.bak .depend
 
+# if using opam, this installs paramcoq at the right place: ~/.opam/...
+# otherwise, use with sudo for a systemwide install
 install:
 	$(MAKE) -f Makefile.coq install

src/paramcoq_mod.ml

@@ -0,0 +1,7 @@
+let _=Mltop.add_known_module"Debug" 
+let _=Mltop.add_known_module"Relations" 
+let _=Mltop.add_known_module"Parametricity" 
+let _=Mltop.add_known_module"Declare_translation" 
+let _=Mltop.add_known_module"Abstraction" 
+let _=Mltop.add_known_module"Paramcoq_mod" 
+let _=Mltop.add_known_module"paramcoq"