From dba5addbf704bdbf5e4c996b8c76f1b42a12b91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vivek=20Das=C2=A0Mohapatra?= <vivek@collabora.co.uk>
Date: Tue, 18 Jul 2017 15:01:17 +0100
Subject: [PATCH] Allow default foreign tree to be set in Makefile.am in proxy
 projects

---
 data/capsule-mkstublib  | 9 +++++----
 data/capsule-shim.mk.in | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/capsule-mkstublib b/data/capsule-mkstublib
index 2a85d86f2..1d5123620 100755
--- a/data/capsule-mkstublib
+++ b/data/capsule-mkstublib
@@ -36,6 +36,7 @@ proxy_excluded=$1; shift;
 proxy_extra=$1;    shift;
 proxy_src=$1;      shift;
 ltver=$1;          shift;
+proxy_tree=$1;     shift;
 
 parse_ltver $ltver;
 
@@ -61,11 +62,11 @@ then
         do
             if [ x$V = x1 ];
             then
-                echo "  $top/capsule-symbols $pt /host" >&2;
+                echo "  $top/capsule-symbols $pt $proxy_tree" >&2;
             else
-                echo "  SYMBOLS $pt /host" >&2;
+                echo "  SYMBOLS $pt $proxy_tree" >&2;
             fi;
-            $top/capsule-symbols $pt /host || exit 1;
+            $top/capsule-symbols $pt $proxy_tree || exit 1;
         done) > $symbol_file.tmp;
     then
         mv $symbol_file.tmp $symbol_file;
@@ -152,7 +153,7 @@ cat - <<EOF
     symbol_ns = LM_ID_NEWLM;
     prefix = secure_getenv( "CAPSULE_PREFIX" );
     if( !prefix )
-        prefix = "/host";
+        prefix = "$proxy_tree";
 
     capsule_init();
 
diff --git a/data/capsule-shim.mk.in b/data/capsule-shim.mk.in
index f2b18454b..d29dfac3e 100644
--- a/data/capsule-shim.mk.in
+++ b/data/capsule-shim.mk.in
@@ -30,7 +30,7 @@ GENSTUB    = $(GENSTUB_V$(V))
 
 # regenerate if any dependencies get updated:
 shim/lib%.so.c: shim/lib%.so.c.excluded shim/lib%.so.c.dlopen shim/lib%.so.symbols
-	$(GENSTUB)V=$V $(mkstub) $$(basename $@ .c) $@.excluded $@.shared $@ $(ltver)
+	$(GENSTUB)V=$V $(mkstub) $$(basename $@ .c) $@.excluded $@.shared $@ $(ltver) $(CAPSULE_TREE)
 
 # regenerate the exportable symbols list
 shim/lib%.so.symbols: shim/lib%.so.c.shared
-- 
GitLab