Fix handling of netdata.conf on install in build system. (#17572)
* Fix handling of netdata.conf on install in build system. * Fix RPM build handling. * Update netdata.spec.in --------- Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
Austin S. Hemmelgarn committed
May 1, 2024 at 11:13 UTC
0f2a261839d5ffc42f17383b4292673aa93d6a1f
2 files changed
+10
-7
CMakeLists.txt
+8
-6
@@ -2523,20 +2523,22 @@ install(FILES
2523
COMPONENT netdata
2524
DESTINATION etc/netdata)
2525
2526
-install(FILES
2527
- system/netdata-updater.conf
2528
- COMPONENT netdata
2529
- DESTINATION etc/netdata)
2530
-
2526
install(PROGRAMS
2527
system/edit-config
2528
COMPONENT netdata
2529
DESTINATION etc/netdata)
2530
2531
+if(BUILD_FOR_PACKAGING)
2532
+ set(NETDATA_CONF_DEST "etc/netdata")
2533
+else()
2534
+ set(NETDATA_CONF_DEST "usr/lib/netdata/conf.d")
2535
+endif()
2536
+
2537
install(FILES
2538
system/netdata.conf
2539
+ system/netdata-updater.conf
2540
COMPONENT netdata
2539
- DESTINATION etc/netdata)
2541
+ DESTINATION ${NETDATA_CONF_DEST})
2542
2543
#
2544
# misc files
netdata.spec.in
+2
-1
@@ -396,7 +396,8 @@ happened, on your systems and applications.
396
rm -rf "${RPM_BUILD_ROOT}"
397
%{cmake_install}
398
399
-install -m 644 -p "system/%{name}.conf" "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}"
399
+install -m 644 -p "${RPM_BUILD_ROOT}%{_libdir}/%{name}/conf.d/%{name}.conf" "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}"
400
+install -m 644 -p "${RPM_BUILD_ROOT}%{_libdir}/%{name}/conf.d/%{name}-updater.conf" "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}"
401
402
# ###########################################################
403
# Install updater script