From 627a5556a079eceb5d4d56562a135d4e2ab13413 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 29 Jul 2015 10:54:02 +0200 Subject: fix Makefiles --- mathcomp/Makefile | 2 +- mathcomp/ssreflect/Makefile | 2 +- mathcomp/ssreflect/Makefile.coq-makefile | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mathcomp/Makefile b/mathcomp/Makefile index 03ad872..e05ce80 100644 --- a/mathcomp/Makefile +++ b/mathcomp/Makefile @@ -21,7 +21,7 @@ MAKEFLAGS+=-B .DEFAULT_GOAL := all %: - $(H)[ -e Makefile.coq ] || $(call coqmakefile) + $(H)[ -e Makefile.coq ] || $(call coqmakefile,ssreflect) # Override COQDEP to find only the "right" copy .ml files $(H)MAKEFLAGS=$(OLD_MAKEFLAGS) $(MAKE) --no-print-directory \ -f Makefile.coq $* \ diff --git a/mathcomp/ssreflect/Makefile b/mathcomp/ssreflect/Makefile index af5a204..c588920 100644 --- a/mathcomp/ssreflect/Makefile +++ b/mathcomp/ssreflect/Makefile @@ -21,7 +21,7 @@ MAKEFLAGS+=-B .DEFAULT_GOAL := all %: - $(H)[ -e Makefile.coq ] || $(call coqmakefile) + $(H)[ -e Makefile.coq ] || $(call coqmakefile,.) # Override COQDEP to find only the "right" copy .ml files $(H)MAKEFLAGS=$(OLD_MAKEFLAGS) $(MAKE) --no-print-directory \ -f Makefile.coq $* \ diff --git a/mathcomp/ssreflect/Makefile.coq-makefile b/mathcomp/ssreflect/Makefile.coq-makefile index 99f3d6b..9cce300 100644 --- a/mathcomp/ssreflect/Makefile.coq-makefile +++ b/mathcomp/ssreflect/Makefile.coq-makefile @@ -1,9 +1,9 @@ define coqmakefile (echo "Generating Makefile.coq for Coq $(V) with COQBIN=$(COQBIN)";\ - ln -sf plugin/$(V)/ssreflect.mllib .;\ - ln -sf plugin/$(V)/ssrmatching.mli .;\ - ln -sf plugin/$(V)/ssrmatching.ml4 .;\ - ln -sf plugin/$(V)/ssreflect.ml4 .;\ + ln -sf $(1)/plugin/$(V)/ssreflect.mllib .;\ + ln -sf $(1)/plugin/$(V)/ssrmatching.mli .;\ + ln -sf $(1)/plugin/$(V)/ssrmatching.ml4 .;\ + ln -sf $(1)/plugin/$(V)/ssreflect.ml4 .;\ $(COQBIN)coq_makefile -f Make -o Makefile.coq) endef -- cgit v1.2.3