diff options
Diffstat (limited to 'mathcomp/field')
| -rw-r--r-- | mathcomp/field/Makefile | 21 | ||||
| -rw-r--r-- | mathcomp/field/falgebra.v | 2 | ||||
| -rw-r--r-- | mathcomp/field/opam | 2 | ||||
| -rw-r--r-- | mathcomp/field/separable.v | 2 |
4 files changed, 5 insertions, 22 deletions
diff --git a/mathcomp/field/Makefile b/mathcomp/field/Makefile index 8f03823..14acb5c 100644 --- a/mathcomp/field/Makefile +++ b/mathcomp/field/Makefile @@ -4,24 +4,7 @@ ifeq "$(COQBIN)" "" COQBIN=$(dir $(shell which coqtop))/ endif -BRANCH_coq = $(shell $(COQBIN)/coqtop -v | head -1 | sed 's/.*version \([0-9]\.[0-9]\)[^ ]* .*/v\1/') - -HASH_coq = $(shell echo Quit. | $(COQBIN)/coqtop 2>&1 | head -1 | sed 's/^.*(\([a-f0-9]*\)).*/\1/' ) - -HASH_coq_v85beta1 = eaa3d0b15adf4eb11ffb00ab087746a5b15c4d5d - - -ifeq "$(HASH_coq)" "$(HASH_coq_v85beta1)" -V=v8.5beta1 -else -V=$(BRANCH_coq) -endif - -ifeq "$V" "v8.4" -COQDEP=../../etc/utils/ssrcoqdep -else COQDEP=$(COQBIN)/coqdep -endif OLD_MAKEFLAGS:=$(MAKEFLAGS) MAKEFLAGS+=-B @@ -30,13 +13,13 @@ MAKEFLAGS+=-B %: $(H)[ -e Makefile.coq ] || $(COQBIN)/coq_makefile -f Make -o Makefile.coq - $(H)MAKEFLAGS=$(OLD_MAKEFLAGS) $(MAKE) --no-print-directory \ + $(H)MAKEFLAGS="$(OLD_MAKEFLAGS)" $(MAKE) --no-print-directory \ -f Makefile.coq $* \ COQDEP='$(COQDEP) -c' .PHONY: clean clean: - $(H)MAKEFLAGS=$(OLD_MAKEFLAGS) $(MAKE) --no-print-directory \ + $(H)MAKEFLAGS="$(OLD_MAKEFLAGS)" $(MAKE) --no-print-directory \ -f Makefile.coq clean $(H)rm -f Makefile.coq diff --git a/mathcomp/field/falgebra.v b/mathcomp/field/falgebra.v index 58eccc2..23f5cba 100644 --- a/mathcomp/field/falgebra.v +++ b/mathcomp/field/falgebra.v @@ -79,7 +79,7 @@ Require Import div tuple finfun bigop ssralg finalg zmodp matrix vector poly. Set Implicit Arguments. Unset Strict Implicit. Unset Printing Implicit Defensive. -Open Local Scope ring_scope. +Local Open Scope ring_scope. Reserved Notation "{ 'aspace' T }" (at level 0, format "{ 'aspace' T }"). Reserved Notation "<< U & vs >>" (at level 0, format "<< U & vs >>"). diff --git a/mathcomp/field/opam b/mathcomp/field/opam index 912eded..cd09358 100644 --- a/mathcomp/field/opam +++ b/mathcomp/field/opam @@ -3,7 +3,7 @@ name: "coq-mathcomp-field" version: "dev" maintainer: "Mathematical Components <mathcomp-dev@sympa.inria.fr>" -homepage: "http://ssr.msr-inria.inria.fr/" +homepage: "http://math-comp.github.io/math-comp/" bug-reports: "Mathematical Components <mathcomp-dev@sympa.inria.fr>" license: "CeCILL-B" diff --git a/mathcomp/field/separable.v b/mathcomp/field/separable.v index e8b8944..6178c01 100644 --- a/mathcomp/field/separable.v +++ b/mathcomp/field/separable.v @@ -34,7 +34,7 @@ Set Implicit Arguments. Unset Strict Implicit. Unset Printing Implicit Defensive. -Open Local Scope ring_scope. +Local Open Scope ring_scope. Import GRing.Theory. Section SeparablePoly. |