nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/knx

Browse Source 
# Conflicts:
#	ChangeLog.md
This commit is contained in:
John
2022-05-14 08:19:38 +02:00
parent 5422f4c29a 458c8dfbc7
commit 9b6fcd3330
9 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -2
View File
@@ -175,5 +175,6 @@ if(EXISTS "${ROOT}/etc/debian_version")
install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/systemd/ebusd.service DESTINATION /lib/systemd/system/)
endif()
if(HAVE_MQTT)
install(FILES ${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/mqtt-*.cfg DESTINATION /etc/ebusd/)
endif(HAVE_MQTT)
FILE(GLOB MQTT_CFG_FILES "${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/mqtt-*.cfg")
install(FILES ${MQTT_CFG_FILES} DESTINATION /etc/ebusd/)
endif(HAVE_MQTT)