diff --git a/Demo_ExternalLib/DeploymentView.aadl b/Demo_ExternalLib/DeploymentView.aadl
index f094f645c88ea4c091ba958c0cd16576f1cc53fd..dac94756a88dcb2f5917459c60aa5cd9151ae249 100644
--- a/Demo_ExternalLib/DeploymentView.aadl
+++ b/Demo_ExternalLib/DeploymentView.aadl
@@ -41,7 +41,7 @@ SUBCOMPONENTS
     Taste::coordinates => "1078 892 2282 1498";
     Deployment::Port_Number => 0;
   };
-  x86_linux32 : PROCESSOR ocarina_processors_x86::x86.native {
+  x86_linux32 : PROCESSOR ocarina_processors_x86::x86.linux32 {
     Taste::coordinates => "927 719 2433 1584";
   };
 PROPERTIES
diff --git a/Demo_ExternalLib/InterfaceView.aadl b/Demo_ExternalLib/InterfaceView.aadl
index 697ca092f62503ad1a30e69807b3a3536d67773e..baeacbe2eb84a4337f46351b1c8ef800c79b7e5c 100644
--- a/Demo_ExternalLib/InterfaceView.aadl
+++ b/Demo_ExternalLib/InterfaceView.aadl
@@ -45,10 +45,10 @@ END Function1;
 SYSTEM IMPLEMENTATION Function1.others
 SUBCOMPONENTS
   flagsToCompileWith : DATA DataView::TASTE_Directive {
-    Taste::FS_Default_Value => "compiler-option:""-I ~/tool-src/testSuites/Demo_ExternalLib/contrib/headers/""";
+    Taste::FS_Default_Value => "compiler-option:""-I $PRJ_FOLDER/contrib/headers/""";
   };
   flagsToLinkWith : DATA DataView::TASTE_Directive {
-    Taste::FS_Default_Value => "linker-option:""-L ~/tool-src/testSuites/Demo_ExternalLib/contrib/lib/ -lsomelib""";
+    Taste::FS_Default_Value => "linker-option:""-L $PRJ_FOLDER/contrib/lib/ -lsomelib""";
   };
   PI1_impl : SUBPROGRAM interfaceview::FV::Function1::PI_PI1.others {
     Compute_Execution_Time => 0 ms .. 0 ms;
diff --git a/Demo_ExternalLib/build-script.sh b/Demo_ExternalLib/build-script.sh
index 987ff65ead1b98ab90708f05af5b53866cf2ee40..611fc2dd9be0084f2b0ddedc499c29b1d91b6a95 100755
--- a/Demo_ExternalLib/build-script.sh
+++ b/Demo_ExternalLib/build-script.sh
@@ -46,6 +46,15 @@ then
 else
     OUTPUTDIR=binary
 fi
+
+# This is the env var used to specify the link folder base
+# inside InterfaceView.aadl:
+#
+#     Taste::FS_Default_Value => "linker-option:""-L $PRJ_FOLDER/contrib/lib/ -lsomelib""";
+#
+export PRJ_FOLDER=$(pwd)
+
+
 assert-builder-ocarina.py \
 	--fast \
 	--debug \