Skip to content

Commit

Permalink
build: fix rpm user file list.
Browse files Browse the repository at this point in the history
the global user file list doesn't work
with some versions of cpack and has to be explicit
to the component that is building (runtime).

Signed-off-by: Jorge Niedbalski <[email protected]>
  • Loading branch information
niedbalski authored and edsiper committed Jul 9, 2021
1 parent ded4f5b commit 99d29a8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(FLB_INSTALL_INCLUDEDIR "include")
else()
set(FLB_INSTALL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR})
set(FLB_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
set(FLB_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${FLB_OUT_NAME}")
set(FLB_INSTALL_CONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/${FLB_OUT_NAME}/")
set(FLB_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
endif()
Expand Down Expand Up @@ -884,7 +884,7 @@ set(CPACK_RPM_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE})
set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/cpack/description")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast data collector for Linux")
set(CPACK_RPM_SPEC_MORE_DEFINE "%define ignore \#")
set(CPACK_RPM_USER_FILELIST
set(CPACK_RPM_RUNTIME_USER_FILELIST
"%config(noreplace) /etc/${FLB_OUT_NAME}/${FLB_OUT_NAME}.conf"
"%config(noreplace) /etc/${FLB_OUT_NAME}/parsers.conf"
"%config(noreplace) /etc/${FLB_OUT_NAME}/plugins.conf"
Expand Down

0 comments on commit 99d29a8

Please sign in to comment.