[Pkg-ocaml-maint-commits] [frama-c] 01/02: Avoid using PWD in the Makefile

[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 321b9553e1873963ebd2bc75755dfdd8376229d9
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 1 17:26:28 2017 +0100

    Avoid using PWD in the Makefile
---
 debian/changelog                                           | 7 +++++++
 debian/patches/0005-Value.cmo-needs-LoopAnalysis.cmo.patch | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb65f9f..671fa6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+frama-c (20161101+silicon+dfsg-4) UNRELEASED; urgency=medium
+
+  * Fix FTBFS by avoiding use of PWD variable in Makefile
+    - Update patch 0005-Value.cmo-needs-LoopAnalysis.cmo.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 01 Jan 2017 17:27:36 +0100
+
 frama-c (20161101+silicon+dfsg-3) unstable; urgency=medium
 
   * Fix typo in Vcs-Browser field
diff --git a/debian/patches/0005-Value.cmo-needs-LoopAnalysis.cmo.patch b/debian/patches/0005-Value.cmo-needs-LoopAnalysis.cmo.patch
index 879a1db..7d460a7 100644
--- a/debian/patches/0005-Value.cmo-needs-LoopAnalysis.cmo.patch
+++ b/debian/patches/0005-Value.cmo-needs-LoopAnalysis.cmo.patch
@@ -10,17 +10,18 @@ PLUGIN_CMO_LIST variable.
  1 file changed, 4 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index abbc8935..6fdf3357 100644
+index abbc8935..e844de36 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1095,6 +1095,10 @@ $(foreach p,$(EXTERNAL_PLUGINS),$(eval $(call INCLUDE_PLUGIN,$p)))
  CMX	= $(CMO:.cmo=.cmx)
  CMI	= $(CMO:.cmo=.cmi)
  
-+PLUGIN_CMO_LIST:=$(subst $(PWD)/lib/plugins/top/Value.cmo,\
-+	$(PWD)/lib/plugins/top/LoopAnalysis.cmo $(PWD)/lib/plugins/top/Value.cmo,\
-+	$(filter-out $(PWD)/lib/plugins/top/LoopAnalysis.cmo, $(PLUGIN_CMO_LIST)))
++PLUGIN_CMO_LIST:=$(subst $(FRAMAC_PLUGIN)/top/Value.cmo,\
++	$(FRAMAC_PLUGIN)/top/LoopAnalysis.cmo $(FRAMAC_PLUGIN)/top/Value.cmo,\
++	$(filter-out $(FRAMAC_PLUGIN)/top/LoopAnalysis.cmo, $(PLUGIN_CMO_LIST)))
 +
  ALL_CMO	= $(CMO) $(PLUGIN_CMO_LIST) $(STARTUP_CMO)
  ALL_CMX	= $(CMX) $(PLUGIN_CMX_LIST) $(STARTUP_CMX)
  
+-- 

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