From 8dcbbc4a92fdc230d8b67e26deaae9aded42724a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Mon, 11 Apr 2016 12:07:18 +0200
Subject: [PATCH] Enable CMAKE_SKIP_INSTALL_PREFIX instead of CMAKE_SKIP_RPATH
 when prepare.py is run in packaging mode

---
 prepare.py               | 2 +-
 submodules/cmake-builder | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/prepare.py b/prepare.py
index 9420f8477..d855af8bb 100755
--- a/prepare.py
+++ b/prepare.py
@@ -205,7 +205,7 @@ def main(argv=None):
 
     if args.package:
         additional_args += ["-DENABLE_PACKAGING=YES"]
-        additional_args += ["-DCMAKE_SKIP_RPATH=YES"]
+	additional_args += ["-DCMAKE_SKIP_INSTALL_RPATH=YES"]
         if platform.system() != 'Windows':
             additional_args += ["-DENABLE_RELATIVE_PREFIX=YES"] # Already forced in all cases on Windows platform
     if check_tools() != 0:
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 38c55f449..9fe68027b 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 38c55f449d4ce8afcbfeb05e1f5066056727c904
+Subproject commit 9fe68027bcfc1e4d8e7a608cb71dab55d09a7fa9