From 7ff1e75c697036df98605ce407db2de697f27943 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 7 Jul 2016 16:01:29 +0200
Subject: [PATCH] Correctly package desktop for raspberry.

---
 prepare.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/prepare.py b/prepare.py
index 96c5ed41e..733e9f388 100755
--- a/prepare.py
+++ b/prepare.py
@@ -47,6 +47,10 @@ class DesktopTarget(prepare.Target):
         self.config_file = 'configs/config-desktop.cmake'
         self.output = 'OUTPUT/' + self.name
         self.external_source_path = os.path.join(current_path, 'submodules')
+        self.packaging_args = [
+            "-DCMAKE_SKIP_INSTALL_RPATH=YES",
+            "-DENABLE_RELATIVE_PREFIX=YES"
+        ]
 
 
 class DesktopRaspberryTarget(prepare.Target):
@@ -59,8 +63,10 @@ class DesktopRaspberryTarget(prepare.Target):
         self.toolchain_file = 'toolchains/toolchain-raspberry.cmake'
         self.output = 'OUTPUT/' + self.name
         self.external_source_path = os.path.join(current_path, 'submodules')
-        self.additional_args += ['-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib']
-        self.additional_args += ['-DENABLE_RELATIVE_PREFIX=YES']
+        self.packaging_args = [
+            "-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib",
+            "-DENABLE_RELATIVE_PREFIX=YES"
+        ]
 
 
 class PythonTarget(prepare.Target):
@@ -128,11 +134,6 @@ class DesktopPreparator(prepare.Preparator):
             self.additional_args += ["-DENABLE_VPX=YES"]
             self.additional_args += ["-DENABLE_X264=NO"]
 
-        if self.args.package:
-            self.additional_args += ["-DENABLE_PACKAGING=YES"]
-            self.additional_args += ["-DCMAKE_SKIP_INSTALL_RPATH=YES"]
-            self.additional_args += ["-DENABLE_RELATIVE_PREFIX=YES"]
-
     def check_environment(self):
         ret = prepare.Preparator.check_environment(self)
         if platform.system() == 'Windows':