From: Romain Forlot <romain.forlot@iot.bzh>
Date: Wed, 24 May 2017 16:16:37 +0000 (+0200)
Subject: Fix: hardcoded path
X-Git-Tag: 3.99.2~75
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=1ab0ddf219ec8c523db844ae85bc2d52ffbe7089;p=apps%2Fapp-templates.git

Fix: hardcoded path

Change-Id: I882f7f69b3577a779266c5347c25ee6d7ab52377
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

diff --git a/cmake/common.cmake b/cmake/common.cmake
index 12ef8e8..fadba0e 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -346,7 +346,7 @@ else()
 endif()
 set(PROJECT_PKG_ENTRY_POINT ${CMAKE_SOURCE_DIR}/packaging CACHE PATH "Where package build files, like rpm.spec file or config.xml, are write.")
 
-set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default CACHE PATH "Default Package Templates Directory")
+set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR} CACHE PATH "Default Package Templates Directory")
 set(SSH_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/ssh)
 set(GDB_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/gdb)
 set(TEMPLATE_WGT_DIR "${PKG_TEMPLATE_PREFIX}/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget")
@@ -355,7 +355,7 @@ set(TEMPLATE_DEB_DIR "${PKG_TEMPLATE_PREFIX}/deb" CACHE PATH "Subpath to a direc
 
 # Default Linkflag
 if(NOT BINDINGS_LINK_FLAG)
-	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/cmake/export.map")
+	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/export.map")
 endif()
 
 # Add a dummy target to enable global dependency order
diff --git a/cmake/config.cmake.sample b/cmake/config.cmake.sample
index 27d9f17..73d3832 100644
--- a/cmake/config.cmake.sample
+++ b/cmake/config.cmake.sample
@@ -31,7 +31,7 @@ set(PROJECT_LANGUAGES,"C")
 
 # Where are stored default templates files from submodule or subtree app-templates in your project tree
 # relative to the root project directory
-set(PROJECT_APP_TEMPLATES_DIR "conf.d")
+set(PROJECT_APP_TEMPLATES_DIR "conf.d/default")
 
 # Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
 # but used and must be built and linked.