From 4b05fda0d8e64ca5079630d43fe898447d003efd Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Mon, 30 Apr 2018 15:48:14 +0200
Subject: [PATCH] Use PROJECT_INSTALL_DATADIR for config files

---
 examples/1-n-1/CMakeLists.txt              | 4 +++-
 examples/1-n-1/fairmq-start-ex-1-n-1.sh.in | 2 +-
 examples/dds/CMakeLists.txt                | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/examples/1-n-1/CMakeLists.txt b/examples/1-n-1/CMakeLists.txt
index 65731369..e425c77b 100644
--- a/examples/1-n-1/CMakeLists.txt
+++ b/examples/1-n-1/CMakeLists.txt
@@ -40,8 +40,10 @@ install(
 
 # configure run script with different executable paths for build and for install directories
 set(EX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(EX_CONF_DIR ${CMAKE_CURRENT_BINARY_DIR})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-1-n-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-n-1.sh)
 set(EX_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
+set(EX_CONF_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-1-n-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-n-1.sh_install)
 
 install(
@@ -53,7 +55,7 @@ install(
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-1-n-1.json ${CMAKE_CURRENT_BINARY_DIR}/ex-1-n-1.json)
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-1-n-1.json
-    DESTINATION ${PROJECT_INSTALL_BINDIR} # TODO: install this in a more appropriate directory
+    DESTINATION ${PROJECT_INSTALL_DATADIR}
 )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-1-n-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-n-1.sh)
diff --git a/examples/1-n-1/fairmq-start-ex-1-n-1.sh.in b/examples/1-n-1/fairmq-start-ex-1-n-1.sh.in
index 806e7d94..0b3c3e1c 100755
--- a/examples/1-n-1/fairmq-start-ex-1-n-1.sh.in
+++ b/examples/1-n-1/fairmq-start-ex-1-n-1.sh.in
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ex2config="@EX_BIN_DIR@/ex-1-n-1.json"
+ex2config="@EX_CONF_DIR@/ex-1-n-1.json"
 
 SAMPLER="fairmq-ex-1-n-1-sampler"
 SAMPLER+=" --id sampler1"
diff --git a/examples/dds/CMakeLists.txt b/examples/dds/CMakeLists.txt
index 7274d20d..72777a25 100644
--- a/examples/dds/CMakeLists.txt
+++ b/examples/dds/CMakeLists.txt
@@ -50,11 +50,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-hosts.cfg ${CMAKE_CURRENT_BINA
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install
-    DESTINATION ${PROJECT_INSTALL_BINDIR}
+    DESTINATION ${PROJECT_INSTALL_DATADIR}
     RENAME ex-dds-topology.xml
 )
 
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg
-    DESTINATION ${PROJECT_INSTALL_BINDIR}
+    DESTINATION ${PROJECT_INSTALL_DATADIR}
 )