updated to use destruct instead of disciminate/injection

diff --git a/helm/software/matita/contribs/RELATIONAL/Nat/fwd.ma b/helm/software/matita/contribs/RELATIONAL/Nat/fwd.ma
index 09847de2ee65a85fa12444f1520866ac3d6af960..0938e4d9ab470234b5d420134410b9c76c244e86 100644 (file)
--- a/helm/software/matita/contribs/RELATIONAL/Nat/fwd.ma
+++ b/helm/software/matita/contribs/RELATIONAL/Nat/fwd.ma
@@ -19,13 +19,13 @@ include "logic/equality.ma".
 include "Nat/defs.ma".
 
 theorem eq_gen_zero_succ: \forall (P:Prop). \forall m2. zero = succ m2 \to P.
- intros. discriminate H.
+ intros. destruct H.
 qed.
 
 theorem eq_gen_succ_zero: \forall (P:Prop). \forall m1. succ m1 = zero \to P.
- intros. discriminate H.
+ intros. destruct H.
 qed.
 
 theorem eq_gen_succ_succ: \forall m1,m2. succ m1 = succ m2 \to m1 = m2.
- intros. injection H. assumption.
+ intros. destruct H. assumption.
 qed.

diff --git a/helm/software/matita/contribs/RELATIONAL/makefile b/helm/software/matita/contribs/RELATIONAL/makefile
index a9ac2184e9011c00b0f479caf4cf44f95c8cfe3f..b3177beae38dae4f73cce539f34be8f75cdb0325 100644 (file)
--- a/helm/software/matita/contribs/RELATIONAL/makefile
+++ b/helm/software/matita/contribs/RELATIONAL/makefile
@@ -9,25 +9,29 @@ CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS)
 
 devel:=$(shell basename `pwd`)
 
+ifneq "$(SRC)" ""
+  XXX="SRC=$(SRC)"
+endif
+
 all: preall
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel)
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel)
 clean: preall
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel)
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel)
 cleanall: preall
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all
 
 all.opt opt: preall
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel)
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel)
 clean.opt: preall
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel)
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel)
 cleanall.opt: preall
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all
 
 %.mo: preall
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@
 %.mo.opt: preall
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $@
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $@
        
 preall:
-       $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel)
+       $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel)