aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpboutill2012-01-16 10:10:23 +0000
committerpboutill2012-01-16 10:10:23 +0000
commit9f208c9353cfcbe765f4b00c067aac71cb903158 (patch)
treee8099b6b5aeba50db796e7ab0beb625e58d6d365
parentdab6e90c7972ef2565c224444900d782f0dd75f9 (diff)
Bug 2679: Do not try to install cmxs with -byte-only
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14907 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--Makefile.build9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.build b/Makefile.build
index c8b4fa5f17..41c5c051af 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -624,7 +624,7 @@ INSTALLCMI = $(sort \
install-library:
$(MKDIR) $(FULLCOQLIB)
- $(INSTALLSH) $(FULLCOQLIB) $(LIBFILES) $(PLUGINS) $(PLUGINSOPT)
+ $(INSTALLSH) $(FULLCOQLIB) $(LIBFILES) $(PLUGINS)
$(MKDIR) $(FULLCOQLIB)/states
$(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
$(MKDIR) $(FULLCOQLIB)/user-contrib
@@ -633,7 +633,7 @@ install-library:
$(INSTALLSH) $(FULLCOQLIB) $(INSTALLCMI)
ifeq ($(BEST),opt)
$(INSTALLLIB) $(LIBCOQRUN) $(FULLCOQLIB)
- $(INSTALLSH) $(FULLCOQLIB) $(CONFIG:.cmo=.cmx) $(CONFIG:.cmo=.o) $(LINKCMO:.cma=.cmxa) $(LINKCMO:.cma=.a)
+ $(INSTALLSH) $(FULLCOQLIB) $(CONFIG:.cmo=.cmx) $(CONFIG:.cmo=.o) $(LINKCMO:.cma=.cmxa) $(LINKCMO:.cma=.a) $(PLUGINSOPT)
endif
# csdpcert is not meant to be directly called by the user; we install
# it with libraries
@@ -644,11 +644,14 @@ endif
install-library-light:
$(MKDIR) $(FULLCOQLIB)
- $(INSTALLSH) $(FULLCOQLIB) $(LIBFILESLIGHT) $(INITPLUGINS) $(INITPLUGINSOPT)
+ $(INSTALLSH) $(FULLCOQLIB) $(LIBFILESLIGHT) $(INITPLUGINS)
$(MKDIR) $(FULLCOQLIB)/states
$(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
rm -f $(FULLCOQLIB)/revision
-$(INSTALLLIB) revision $(FULLCOQLIB)
+ifeq ($(BEST),opt)
+ $(INSTALLSH) $(FULLCOQLIB) $(INITPLUGINSOPT)
+endif
install-coq-info: install-coq-manpages install-emacs install-latex