diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15ea606a54..fb89c86ff9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -170,7 +170,7 @@ jobs: - name: Test sinsp-example runtime linker run: | cd userspace/libsinsp/examples - export LD_LIBRARY_PATH=/tmp/libs-test/lib/falcosecurity + export LD_LIBRARY_PATH=/tmp/libs-test/lib ./sinsp-example -h build-libs-others-amd64: @@ -227,7 +227,7 @@ jobs: - name: Test sinsp-example runtime linker 🧪 run: | cd userspace/libsinsp/examples - export DYLD_LIBRARY_PATH=/tmp/libs-test/lib/falcosecurity + export DYLD_LIBRARY_PATH=/tmp/libs-test/lib ./sinsp-example -h # This job run all engine tests and scap-open diff --git a/cmake/modules/libscap.cmake b/cmake/modules/libscap.cmake index 6dcdb811e8..833687fa5d 100644 --- a/cmake/modules/libscap.cmake +++ b/cmake/modules/libscap.cmake @@ -122,8 +122,8 @@ string(REPLACE ";" " " LIBSCAP_LINK_LIBDIRS_FLAGS "${libscap_link_libdirs}") configure_file(${LIBSCAP_DIR}/userspace/libscap/libscap.pc.in ${PROJECT_BINARY_DIR}/libscap/libscap.pc @ONLY) install(TARGETS ${LIBSCAP_INSTALL_LIBS} - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT "scap" OPTIONAL) install(DIRECTORY "${LIBSCAP_INCLUDE_DIR}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace" diff --git a/cmake/modules/libsinsp.cmake b/cmake/modules/libsinsp.cmake index d3b2a1c151..48fcff7560 100644 --- a/cmake/modules/libsinsp.cmake +++ b/cmake/modules/libsinsp.cmake @@ -90,8 +90,8 @@ endfunction() add_subdirectory(${LIBSINSP_DIR}/userspace/libsinsp ${CMAKE_BINARY_DIR}/libsinsp) install(TARGETS sinsp - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT "sinsp") install(DIRECTORY "${LIBSINSP_DIR}/userspace/libsinsp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace" diff --git a/userspace/libscap/libscap.pc.in b/userspace/libscap/libscap.pc.in index cc5de61994..62589d6963 100644 --- a/userspace/libscap/libscap.pc.in +++ b/userspace/libscap/libscap.pc.in @@ -6,5 +6,5 @@ Name: libscap Description: lib for System CAPture Version: @FALCOSECURITY_LIBS_VERSION@ -Libs: -L${libdir}/@LIBS_PACKAGE_NAME@ @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@ +Libs: -L${libdir} @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@ Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/libscap diff --git a/userspace/libsinsp/libsinsp.pc.in b/userspace/libsinsp/libsinsp.pc.in index c3951ae82a..8c7fb4f562 100644 --- a/userspace/libsinsp/libsinsp.pc.in +++ b/userspace/libsinsp/libsinsp.pc.in @@ -7,5 +7,5 @@ Description: lib for System INSPection Version: @FALCOSECURITY_LIBS_VERSION@ Requires: libscap -Libs: -L${libdir}/@LIBS_PACKAGE_NAME@ -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@ +Libs: -L${libdir} -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@ Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/libsinsp @SINSP_PKG_CONFIG_INCLUDES@