From 152decfa952f9e90557f6c5b350c4849d18f012e Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Tue, 21 Jul 2015 15:46:21 +0200 Subject: fix Makefile for trunk --- mathcomp/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'mathcomp') diff --git a/mathcomp/Makefile b/mathcomp/Makefile index c5a0a3b..880977c 100644 --- a/mathcomp/Makefile +++ b/mathcomp/Makefile @@ -4,17 +4,11 @@ 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 +ifeq "$(shell $(COQBIN)/coqtop -v | head -1 | grep trunk | wc -l | sed 's/ *//g')" "1" +V=trunk else -V=$(BRANCH_coq) +V=$(shell $(COQBIN)/coqtop -v | head -1 | \ + sed 's/.*version \([0-9]\.[0-9]\)[^ ]* .*/v\1/') endif ifeq "$V" "v8.4" -- cgit v1.2.3