From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 16 Nov 2017 09:22:43 +0000 (+0100)
Subject: Could specify others default install directories
X-Git-Tag: 4.99.3~8
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=054d3b870d1b838e5541a9aff00f852698d45a0e;p=staging%2Fxdg-launcher.git

Could specify others default install directories

Path to default package BINDIR, LIBDIR, ETCDIR, DATADIR and
HTTPDIR.

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

diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake
index e90ff11..da6753a 100644
--- a/cmake/cmake.d/02-variables.cmake
+++ b/cmake/cmake.d/02-variables.cmake
@@ -144,3 +144,10 @@ set(GDB_INITIAL_BREAK "personality" CACHE STRING "Initial Break Point for GDB re
 set(LUA_CHECKER "luac" "-p" CACHE STRING "LUA compiler")
 set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
 set(JSON_CHECKER "" CACHE STRING "JSON linter")
+
+# Default GNU directories path variables
+set(BINDIR bin CACHE PATH "User executables")
+set(ETCDIR etc CACHE PATH "Read only system configuration data")
+set(LIBDIR lib CACHE PATH "System library directory")
+set(HTTPDIR htdocs CACHE PATH "HTML5 data directory")
+set(DATADIR data CACHE PATH "External data resources files")
diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index bf297a2..e99208b 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -269,11 +269,6 @@ endmacro()
 # Pre-packaging
 macro(project_targets_populate)
 	# Default Widget default directory
-	set(BINDIR bin)
-	set(ETCDIR etc)
-	set(LIBDIR lib)
-	set(HTTPDIR htdocs)
-	set(DATADIR data)
 	set(PACKAGE_BINDIR  ${PROJECT_PKG_BUILD_DIR}/${BINDIR})
 	set(PACKAGE_ETCDIR  ${PROJECT_PKG_BUILD_DIR}/${ETCDIR})
 	set(PACKAGE_LIBDIR  ${PROJECT_PKG_BUILD_DIR}/${LIBDIR})