From 4e13647d8f7a46945443e016ea3f248040be8a06 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Mon, 12 Jun 2017 12:57:19 -0400 Subject: Better support for coq_makefile2 with fewer warnings --- .gitignore | 1 + Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8547a7612..ef8de5c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ Makefile.bak Makefile.coq Makefile.coq.bak +Makefile-old.conf csdp.cache lia.cache nlia.cache diff --git a/Makefile b/Makefile index f88a69a58..612f7b656 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ PROFILE?= VERBOSE?= SHOW := $(if $(VERBOSE),@true "",@echo "") HIDE := $(if $(VERBOSE),,@) +INSTALLDEFAULTROOT := Crypto .PHONY: coq clean update-_CoqProject cleanall install \ install-coqprime clean-coqprime coqprime \ @@ -102,7 +103,7 @@ install-coqprime: Makefile.coq: Makefile _CoqProject $(SHOW)'COQ_MAKEFILE -f _CoqProject > $@' - $(HIDE)$(COQBIN)coq_makefile -f _CoqProject | sed s'/^clean:$$/clean::/g' | sed s'/^Makefile: /Makefile-old: /g' | sed s'/^printenv:$$/printenv::/g' > $@ + $(HIDE)$(COQBIN)coq_makefile -f _CoqProject INSTALLDEFAULTROOT = $(INSTALLDEFAULTROOT) -o Makefile-old && cat Makefile-old | sed s'/^printenv:$$/printenv::/g' > $@ && rm -f Makefile-old $(DISPLAY_NON_JAVA_VO:.vo=.log) : %Display.log : %.vo %Display.v src/Compilers/Z/CNotations.vo src/Specific/IntegrationTestDisplayCommon.vo $(SHOW)"COQC $*Display > $@" -- cgit v1.2.3