From 3084c88ee0be99bf789023ac71f4df37a47a608b Mon Sep 17 00:00:00 2001
From: jbnadal <jbnadal@awox.com>
Date: Fri, 9 Dec 2016 18:00:35 +0100
Subject: [PATCH] ubox could compile.

---
 bsp/buildroot_external/package/ubox/ubox.mk |  8 ++++----
 src/3P/ubox/builders/cmake/CMakeLists.txt   | 13 +++++--------
 src/3P/ubus/builders/cmake/CMakeLists.txt   |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/bsp/buildroot_external/package/ubox/ubox.mk b/bsp/buildroot_external/package/ubox/ubox.mk
index ff69d165..164296b5 100644
--- a/bsp/buildroot_external/package/ubox/ubox.mk
+++ b/bsp/buildroot_external/package/ubox/ubox.mk
@@ -12,10 +12,10 @@ UBOX_INSTALL_STAGING = YES
 
 UBOX_DEPENDENCIES = libubox ubus
 
-CONF = AWOXCVS2=$(TOPDIR)/../../../
+UBOX_CONF = SRC_DIR=$(TOPDIR)/../..
 
-UBOX_CONF_ENV = $(CONF)
-UBOX_MAKE_ENV = $(CONF)
-UBOX_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
+UBOX_CONF_ENV = $(UBOX_CONF)
+UBOX_MAKE_ENV = $(UBOX_CONF)
+UBOX_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
 
 $(eval $(cmake-package))
diff --git a/src/3P/ubox/builders/cmake/CMakeLists.txt b/src/3P/ubox/builders/cmake/CMakeLists.txt
index 80c9bb49..837663dc 100644
--- a/src/3P/ubox/builders/cmake/CMakeLists.txt
+++ b/src/3P/ubox/builders/cmake/CMakeLists.txt
@@ -8,26 +8,23 @@ set (CMAKE_MODULE_PATH "${MODULE_PATH}")
 
 set(DISABLE_TARGET_OPTIMIZATION ON)
 
-include (aw)
+include (br)
 
 # Logd
-
 add_executable (logd 
-	$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/log/logd.c
-	$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/log/syslog.c)
+	$ENV{SRC_DIR}/src/3P/ubox/log/logd.c
+	$ENV{SRC_DIR}/src/3P/ubox/log/syslog.c)
 target_link_libraries (logd ubox ubus)
 install (TARGETS logd RUNTIME DESTINATION sbin)
 
 # Logread
-
 add_executable (logread 
-	$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/log/logread.c)
+	$ENV{SRC_DIR}/src/3P/ubox/log/logread.c)
 target_link_libraries (logread ubox ubus json-c blobmsg_json)
 install (TARGETS logread RUNTIME DESTINATION sbin)
 
 # kmodloader
-
 add_executable (kmodloader 
-	$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/kmodloader.c)
+	$ENV{SRC_DIR}/src/3P/ubox/kmodloader.c)
 target_link_libraries (kmodloader ubox)
 install (TARGETS kmodloader RUNTIME DESTINATION ../sbin)
diff --git a/src/3P/ubus/builders/cmake/CMakeLists.txt b/src/3P/ubus/builders/cmake/CMakeLists.txt
index 0733b05a..5ca59a6c 100644
--- a/src/3P/ubus/builders/cmake/CMakeLists.txt
+++ b/src/3P/ubus/builders/cmake/CMakeLists.txt
@@ -36,7 +36,7 @@ target_include_directories (ubus PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 install (TARGETS ubus LIBRARY DESTINATION local/lib)
 
-file (GLOB ubus_headers $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/*.h)
+file (GLOB ubus_headers $ENV{SRC_DIR}/src/3P/ubus/*.h)
 install (FILES ${ubus_headers} DESTINATION include/ubus)