File 001-use-lib64-paths-and-share-path.diff of Package pharos

Overview Repositories Revisions Requests Users Attributes Meta

File 001-use-lib64-paths-and-share-path.diff of Package pharos (Revision db9b372798fc3562371f5f1d12f189bb)

Currently displaying revision db9b372798fc3562371f5f1d12f189bb , Show latest

diff --git a/libpharos/CMakeLists.txt b/libpharos/CMakeLists.txt
index 8bbc8d0..67863e5 100644
--- a/libpharos/CMakeLists.txt
+++ b/libpharos/CMakeLists.txt
@@ -108,21 +108,21 @@ target_include_directories(pharos PUBLIC
   $<INSTALL_INTERFACE:include/libpharos>)
 
 # install target
-install(TARGETS pharos EXPORT libpharos DESTINATION lib)
+install(TARGETS pharos EXPORT libpharos DESTINATION lib64)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include
   FILES_MATCHING PATTERN "*.hpp")
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DESTINATION include
   FILES_MATCHING
   PATTERN "*.hpp"
   PATTERN "build.hpp" EXCLUDE)
-install(EXPORT libpharos DESTINATION lib/cmake/libpharos
+install(EXPORT libpharos DESTINATION lib64/cmake/libpharos
   EXPORT_LINK_INTERFACE_LIBRARIES)
 
 # Create config.yaml
 get_filename_component(SWI_INSTALL_DIR "${SWIPL_EXECUTABLE}" DIRECTORY)
 configure_file(config.yaml.in config.yaml)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.yaml"
-  DESTINATION etc
+  DESTINATION share/pharos
   RENAME pharos.yaml)
 
 # Create version.hpp
diff --git a/libpharos/options.cpp b/libpharos/options.cpp
index 1f3bdce..934eb60 100644
--- a/libpharos/options.cpp
+++ b/libpharos/options.cpp
@@ -345,7 +345,7 @@ static ProgOptVarMap parse_cert_options_internal(
   bf::path program = argv[0];
   vm.config(pharos::Config::load_config(
               program.filename().native(),
-              vm.count("no-site-file") ? nullptr : (root_loc / "etc/pharos.yaml").c_str(),
+              vm.count("no-site-file") ? nullptr : (root_loc / "share/pharos/pharos.yaml").c_str(),
               vm.count("no-site-file") ? nullptr : "PHAROS_CONFIG",
               vm.count("no-user-file") ? nullptr : ".pharos.yaml"));
   if (vm.count("config")) {

Places

File 001-use-lib64-paths-and-share-path.diff of Package pharos (Revision db9b372798fc3562371f5f1d12f189bb)

Places