1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 |
- From 696b6be8a623f4466def2a161baa26094e5592a4 Mon Sep 17 00:00:00 2001
- From: Michal Vasko <mvasko@cesnet.cz>
- Date: Wed, 18 May 2022 09:14:35 +0200
- Subject: [PATCH] build BUGFIX use DESTDIR when executing scripts
- Fixes #1217
- [Upstream accepted 696b6be8a623f4466def2a161baa26094e5592a4]
- Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
- ---
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index efe922d..60e3150 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -351,7 +351,7 @@ if(INSTALL_MODULES)
- set(ENV{NP2_MODULE_GROUP} \"${MODULES_GROUP}\")
- set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\")
- set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\")
- - execute_process(COMMAND \"${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES)
- + execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES)
- if(NOT SETUP_RES EQUAL \"0\")
- message(FATAL_ERROR \" scripts/setup.sh failed: \${SETUP_RES}\")
- endif()
- @@ -364,7 +364,7 @@ if(GENERATE_HOSTKEY)
- message(STATUS \"Generating a new RSA host key \\\"genkey\\\" if not already added...\")
- set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\")
- set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\")
- - execute_process(COMMAND ${SCRIPT_DIR}/merge_hostkey.sh RESULT_VARIABLE MERGE_HOSTKEY_RES)
- + execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_hostkey.sh\" RESULT_VARIABLE MERGE_HOSTKEY_RES)
- if(NOT MERGE_HOSTKEY_RES EQUAL \"0\")
- message(FATAL_ERROR \" scripts/merge_hostkey.sh failed: \${MERGE_HOSTKEY_RES}\")
- endif()
- @@ -375,7 +375,7 @@ if(MERGE_LISTEN_CONFIG)
- message(STATUS \"Merging default server listen configuration if there is none...\")
- set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\")
- set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\")
- - execute_process(COMMAND ${SCRIPT_DIR}/merge_config.sh RESULT_VARIABLE MERGE_CONFIG_RES)
- + execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_config.sh\" RESULT_VARIABLE MERGE_CONFIG_RES)
- if(NOT MERGE_CONFIG_RES EQUAL \"0\")
- message(FATAL_ERROR \" scripts/merge_config.sh failed: \${MERGE_CONFIG_RES}\")
- endif()
- --
- 2.30.2
|