From 2ccec00285b3bf67d230eedda120cd72c328cfbb Mon Sep 17 00:00:00 2001 From: Jim Fehrle Date: Wed, 23 May 2018 20:22:56 -0700 Subject: Don't try to install native compiled files if native-compile is not set --- Makefile.install | 2 +- Makefile.vofiles | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.install b/Makefile.install index 0764b61fc..984cfc05c 100644 --- a/Makefile.install +++ b/Makefile.install @@ -82,7 +82,7 @@ endif install-tools: $(MKDIR) $(FULLBINDIR) - # recopie des fichiers de style pour coqide + # copy style files for coqide $(MKDIR) $(FULLCOQLIB)/tools/coqdoc $(INSTALLLIB) tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc $(INSTALLBIN) $(TOOLS) $(FULLBINDIR) diff --git a/Makefile.vofiles b/Makefile.vofiles index fc902c4a8..b1e97e991 100644 --- a/Makefile.vofiles +++ b/Makefile.vofiles @@ -30,9 +30,10 @@ vo_to_cm = $(foreach vo,$(1),$(dir $(vo)).coq-native/$(subst /,_,$(patsubst theo vo_to_obj = $(foreach vo,$(1),$(dir $(vo)).coq-native/$(subst /,_,$(patsubst theories/%,NCoq_%,$(patsubst plugins/%,NCoq_%,$(vo:.vo=.o))))) GLOBFILES:=$(ALLVO:.vo=.glob) -LIBFILES:=$(ALLVO) $(call vo_to_cm,$(ALLVO)) \ - $(call vo_to_obj,$(ALLVO)) \ - $(VFILES) $(GLOBFILES) +ifdef NATIVECOMPUTE +NATIVEFILES := $(call vo_to_cm,$(ALLVO)) $(call vo_to_obj,$(ALLVO)) +endif +LIBFILES:=$(ALLVO) $(NATIVEFILES) $(VFILES) $(GLOBFILES) # For emacs: # Local Variables: -- cgit v1.2.3