[Pkg-ocaml-maint-commits] [frama-c] 04/07: Fix installation target on bytecode architectures

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository frama-c.

commit 4a9dd7b3e357d850b3527f235b915c0356951e7e
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Sep 10 13:10:19 2017 +0200

    Fix installation target on bytecode architectures
---
 ...allation-target-on-bytecode-architectures.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/0011-Fix-installation-target-on-bytecode-architectures.patch b/debian/patches/0011-Fix-installation-target-on-bytecode-architectures.patch
new file mode 100644
index 0000000..8bb1dcc
--- /dev/null
+++ b/debian/patches/0011-Fix-installation-target-on-bytecode-architectures.patch
@@ -0,0 +1,36 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 10 Sep 2017 13:08:08 +0200
+Subject: Fix installation target on bytecode architectures
+
+---
+ Makefile | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6651900..55195e6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1582,15 +1582,21 @@ install:: install-lib
+ 	if [ -d "$(FRAMAC_PLUGIN)" -a "$(PLUGIN_DYN_EXISTS)" = "yes" ]; then \
+ 	  $(CP)  $(PLUGIN_DYN_CMI_LIST) $(PLUGIN_META_LIST) \
+ 		 $(FRAMAC_PLUGINDIR); \
+-	  $(CP)  $(PLUGIN_DYN_CMO_LIST) $(PLUGIN_DYN_CMX_LIST) \
++	  $(CP)  $(PLUGIN_DYN_CMO_LIST) \
+ 		 $(FRAMAC_PLUGINDIR)/top; \
++          if [ "$(OCAMLBEST)" = "opt" ]; then \
++	    $(CP) $(PLUGIN_DYN_CMX_LIST) $(FRAMAC_PLUGINDIR)/top; \
++          fi; \
+ 	fi
+ 	$(PRINT_INSTALL) dynamic gui plug-ins
+ 	if [ -d "$(FRAMAC_PLUGIN_GUI)" -a "$(PLUGIN_DYN_GUI_EXISTS)" = "yes" ]; \
+ 	then \
+ 	  $(CP) $(patsubst %.cma,%.cmi,$(PLUGIN_DYN_GUI_CMO_LIST:.cmo=.cmi)) \
+-		$(PLUGIN_DYN_GUI_CMO_LIST) $(PLUGIN_DYN_GUI_CMX_LIST) \
++		$(PLUGIN_DYN_GUI_CMO_LIST) \
+ 		$(FRAMAC_PLUGINDIR)/gui; \
++	  if [ "$(OCAMLBEST)" = "opt" ]; then \
++	    $(CP) $(PLUGIN_DYN_GUI_CMX_LIST) $(FRAMAC_PLUGINDIR)/gui; \
++          fi; \
+ 	fi
+ 	$(PRINT_INSTALL) man pages
+ 	$(CP) man/frama-c.1 $(MANDIR)/man1/frama-c.1
diff --git a/debian/patches/series b/debian/patches/series
index 481369d..f13c859 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-More-fixes-of-spelling-errors.patch
 0009-Better-handling-of-dynlink-detection.patch
 0010-Add-zsh-completion-file.patch
+0011-Fix-installation-target-on-bytecode-architectures.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/frama-c.git