diff --git a/.gitattributes b/.gitattributes
index d48a652495e473459d74e13f6dc5f1f7a6a0e39b..4e72494f5777a484724608b1c03bafcb2e14995d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4680,7 +4680,6 @@ SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py -text
SAS/ResourceAssignment/ResourceAssignmentDatabase/doc/ResourceAssignmentDatabase.md -text
SAS/ResourceAssignment/ResourceAssignmentDatabase/doc/package.dox -text
SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py -text
-SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt -text
SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/README -text
SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_functions_and_triggers.sql -text
SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_notifications.sql -text
diff --git a/Docker/CMakeLists.txt b/Docker/CMakeLists.txt
index f2afd8b1ecf79d77c8825bdbec1840bcc9a877ea..bb97e1a1c10a1f27b0e7c6a6d939b7467287fcc5 100644
--- a/Docker/CMakeLists.txt
+++ b/Docker/CMakeLists.txt
@@ -33,6 +33,8 @@ set(DOCKER_TEMPLATE_DIRS
lofar_add_bin_scripts(docker-template)
lofar_add_sbin_scripts(docker-build-all.sh)
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
# Convert Dockerfile.tmpl -> Dockerfile in ${DOCKER_TEMPLATE_DIRS}
foreach(_dir ${DOCKER_TEMPLATE_DIRS})
# _src -> _dst
@@ -52,6 +54,7 @@ foreach(_dir ${DOCKER_TEMPLATE_DIRS})
install(FILES
${_dst}
DESTINATION share/docker/${_dir}
+ COMPONENT ${lower_package_name}
RENAME Dockerfile
)
endforeach()
@@ -65,5 +68,6 @@ install(DIRECTORY
lofar-outputproc
lofar-tbbwriter
DESTINATION share/docker
+ COMPONENT ${lower_package_name}
USE_SOURCE_PERMISSIONS
PATTERN Dockerfile.tmpl EXCLUDE)
diff --git a/LCS/Common/include/Common/CMakeLists.txt b/LCS/Common/include/Common/CMakeLists.txt
index f759d87e8deda67b4cdb0b09997064fc40f05146..3d8fcd12950a56257dd05bf18eae6d46f9266f60 100644
--- a/LCS/Common/include/Common/CMakeLists.txt
+++ b/LCS/Common/include/Common/CMakeLists.txt
@@ -5,6 +5,8 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
# Install header files.
install(FILES
Allocator.h
@@ -80,18 +82,21 @@ install(FILES
TypeNames.h
TypeNames.tcc
Version.h
- DESTINATION include/${PACKAGE_NAME})
+ DESTINATION include/${PACKAGE_NAME}
+ COMPONENT ${lower_package_name})
install(FILES
Net/FdSet.h
Net/Socket.h
- DESTINATION include/${PACKAGE_NAME}/Net)
+ DESTINATION include/${PACKAGE_NAME}/Net
+ COMPONENT ${lower_package_name})
install(FILES
shmem/segbasemap.h
shmem/dlmalloc.h
shmem/shmem_alloc.h
- DESTINATION include/${PACKAGE_NAME}/shmem)
+ DESTINATION include/${PACKAGE_NAME}/shmem
+ COMPONENT ${lower_package_name})
install(FILES
Thread/Barrier.h
@@ -102,4 +107,5 @@ install(FILES
Thread/Sem_t.h
Thread/Semaphore.h
Thread/Thread.h
- DESTINATION include/${PACKAGE_NAME}/Thread)
+ DESTINATION include/${PACKAGE_NAME}/Thread
+ COMPONENT ${lower_package_name})
diff --git a/LCS/MessageBus/include/MessageBus/CMakeLists.txt b/LCS/MessageBus/include/MessageBus/CMakeLists.txt
index 4d5c85e09a296312fa0da2f8eb53510c67ef6ab9..b6b40c9585a76efcda7222ccc6200899a864fff0 100644
--- a/LCS/MessageBus/include/MessageBus/CMakeLists.txt
+++ b/LCS/MessageBus/include/MessageBus/CMakeLists.txt
@@ -5,6 +5,8 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
# Install header files.
install(FILES
Exceptions.h
@@ -14,12 +16,14 @@ install(FILES
NoQpidFallback.h
ToBus.h
XMLDoc.h
- DESTINATION include/${PACKAGE_NAME})
+ DESTINATION include/${PACKAGE_NAME}
+ COMPONENT ${lower_package_name})
install(FILES
Protocols/TaskFeedbackDataproducts.h
Protocols/TaskFeedbackProcessing.h
Protocols/TaskFeedbackState.h
Protocols/TaskSpecificationSystem.h
- DESTINATION include/${PACKAGE_NAME}/Protocols)
+ DESTINATION include/${PACKAGE_NAME}/Protocols
+ COMPONENT ${lower_package_name})
diff --git a/LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt b/LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt
index 37f061db1b9c844b9657a6b75d85abbd35bd35b7..b7bd06045f161990395675a93c4fcdc708134bc5 100644
--- a/LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt
+++ b/LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt
@@ -2,6 +2,5 @@
lofar_add_bin_scripts(serviceskeleton)
# supervisord config files
-install(FILES
- serviceskeleton.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(serviceskeleton.ini
+ DESTINATION supervisord.d)
diff --git a/LCS/pyparameterset/src/CMakeLists.txt b/LCS/pyparameterset/src/CMakeLists.txt
index a5085bcdd31ce4646d61e1b406bbe24b2a21a052..1c8ae13cb384f0d1a3d0f419da84acf963a75b4f 100644
--- a/LCS/pyparameterset/src/CMakeLists.txt
+++ b/LCS/pyparameterset/src/CMakeLists.txt
@@ -12,11 +12,14 @@ set_target_properties(_pyparameterset PROPERTIES
PREFIX ""
LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BUILD_DIR}/lofar/parameterset)
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
# This is a quick-and-dirty fix to install the Python binding module in the
# right place. It will now be installed twice, because lofar_add_library()
# will install it in $prefix/$libdir
install(TARGETS _pyparameterset
- DESTINATION ${PYTHON_INSTALL_DIR}/lofar/parameterset)
+ DESTINATION ${PYTHON_INSTALL_DIR}/lofar/parameterset
+ COMPONENT ${lower_package_name})
# We only need this library because dependent packages need to link against
# this package's version info.
diff --git a/LCS/pytools/include/pytools/CMakeLists.txt b/LCS/pytools/include/pytools/CMakeLists.txt
index 152059e1df82f5937b7467c09da20d6da8823642..dd3a158564cf3a03130d2ac46e8f4f1f0dc3f7ec 100644
--- a/LCS/pytools/include/pytools/CMakeLists.txt
+++ b/LCS/pytools/include/pytools/CMakeLists.txt
@@ -5,8 +5,11 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
# Install header files.
install(FILES
PycExcp.h
PycBasicData.h
- DESTINATION include/${PACKAGE_NAME})
+ DESTINATION include/${PACKAGE_NAME}
+ COMPONENT ${lower_package_name})
diff --git a/MAC/Services/TaskManagement/Server/bin/CMakeLists.txt b/MAC/Services/TaskManagement/Server/bin/CMakeLists.txt
index 3a6a6387c56b36ad7e52f72de26a088f56edff92..fd3602224938473cf1fdf7e365274bbfd16fac3e 100644
--- a/MAC/Services/TaskManagement/Server/bin/CMakeLists.txt
+++ b/MAC/Services/TaskManagement/Server/bin/CMakeLists.txt
@@ -2,6 +2,5 @@
lofar_add_bin_scripts(taskmanagement)
# supervisord config files
-install(FILES
- taskmanagement.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(taskmanagement.ini
+ DESTINATION supervisord.d)
diff --git a/MAC/Services/src/CMakeLists.txt b/MAC/Services/src/CMakeLists.txt
index 0edf21396d23a53621c7fe0237bea7a010536939..0ad33f95e26f9bd5c0de7cf83ff71863d202a182 100644
--- a/MAC/Services/src/CMakeLists.txt
+++ b/MAC/Services/src/CMakeLists.txt
@@ -18,7 +18,6 @@ python_install(
)
# supervisord config files
-install(FILES
- pipelinecontrol.ini
+lofar_add_sysconf_files(pipelinecontrol.ini
observationcontrol2.ini
- DESTINATION etc/supervisord.d)
+ DESTINATION supervisord.d)
diff --git a/SAS/DataManagement/Cleanup/AutoCleanupService/CMakeLists.txt b/SAS/DataManagement/Cleanup/AutoCleanupService/CMakeLists.txt
index 5f189079d723412b3b23e12355e47f7a217b1a29..b417dc23a5e5d9a43a41a05946f6a073bfa3e30d 100644
--- a/SAS/DataManagement/Cleanup/AutoCleanupService/CMakeLists.txt
+++ b/SAS/DataManagement/Cleanup/AutoCleanupService/CMakeLists.txt
@@ -12,7 +12,6 @@ python_install(${_py_files} DESTINATION lofar/sas/datamanagement/autocleanup)
lofar_add_bin_scripts(autocleanupservice)
# supervisord config files
-install(FILES
- autocleanupservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(autocleanupservice.ini
+ DESTINATION supervisord.d)
diff --git a/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt b/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
index 16f81c0da6a2ed8110e0b5db38b6cce7ac624452..44ea9c08f52b397d42c0381034bded770e718da4 100644
--- a/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
+++ b/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
@@ -15,7 +15,6 @@ python_install(${_py_files} DESTINATION lofar/sas/datamanagement/cleanup)
lofar_add_bin_scripts(cleanupservice)
# supervisord config files
-install(FILES
- cleanupservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(cleanupservice.ini
+ DESTINATION supervisord.d)
diff --git a/SAS/DataManagement/StorageQueryService/CMakeLists.txt b/SAS/DataManagement/StorageQueryService/CMakeLists.txt
index d48a43ec6a1c4c7ad3cb171cd5bb2eee6f22c969..c7e5e8b5547df116e26305217046de391751b951 100644
--- a/SAS/DataManagement/StorageQueryService/CMakeLists.txt
+++ b/SAS/DataManagement/StorageQueryService/CMakeLists.txt
@@ -19,8 +19,7 @@ python_install(${_py_files} DESTINATION lofar/sas/datamanagement/storagequery)
lofar_add_bin_scripts(storagequery storagequeryservice)
# supervisord config files
-install(FILES
- storagequeryservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(storagequeryservice.ini
+ DESTINATION supervisord.d)
add_subdirectory(test)
diff --git a/SAS/OTDB_Services/CMakeLists.txt b/SAS/OTDB_Services/CMakeLists.txt
index 2174576698b191a85fbf8a746bfc3cad8a9063bb..e41b2fa2e3c8a78204374e2e85da463688264355 100644
--- a/SAS/OTDB_Services/CMakeLists.txt
+++ b/SAS/OTDB_Services/CMakeLists.txt
@@ -19,11 +19,11 @@ set(_py_files
)
# supervisord config files
-install(FILES
+lofar_add_sysconf_files(
TreeService.ini
TreeStatusEvents.ini
OTDB_Services.ini
- DESTINATION etc/supervisord.d)
+ DESTINATION supervisord.d)
python_install(${_py_files} DESTINATION lofar/sas/otdb)
diff --git a/SAS/QPIDInfrastructure/bin/CMakeLists.txt b/SAS/QPIDInfrastructure/bin/CMakeLists.txt
index cf062009e8be156d0b5dfe65dc7269b7cc3025bb..a4662f8b510a88257e24b433c651826b46297441 100644
--- a/SAS/QPIDInfrastructure/bin/CMakeLists.txt
+++ b/SAS/QPIDInfrastructure/bin/CMakeLists.txt
@@ -7,4 +7,4 @@ lofar_add_bin_scripts(addtoQPIDDB.py
gatherfrombrokers.sh
route_to_struct.py)
-install_files(/share/qpidinfrastructure/sql qpidinfra_dump.sql)
+lofar_add_data_files(qpidinfra_dump.sql DESTINATION qpidinfrastructure/sql)
diff --git a/SAS/QPIDInfrastructure/sql/CMakeLists.txt b/SAS/QPIDInfrastructure/sql/CMakeLists.txt
index 92af7c13c0d3697af8ea6e9bdf1b711a1c7fc7e0..d2cd66ec0b716d18e573a5029f2f26f88f8fbbd7 100644
--- a/SAS/QPIDInfrastructure/sql/CMakeLists.txt
+++ b/SAS/QPIDInfrastructure/sql/CMakeLists.txt
@@ -1,4 +1,3 @@
# $Id: CMakeLists.txt 32341 2015-08-28 11:59:26Z schaap $
-install_files(/share/qpidinfrastructure/sql qpidinfradb.sql)
-
+lofar_add_data_files(qpidinfradb.sql DESTINATION qpidinfrastructure/sql)
diff --git a/SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt b/SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt
index 1e29bd04eede7cbad861a3afa1cabc7c82359ccb..043665aa8135a2bba0bb4bb2c3bfcd1ba7666c55 100644
--- a/SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt
+++ b/SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt
@@ -15,7 +15,6 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/otdbtoratas
lofar_add_bin_scripts(otdbtorataskstatuspropagator)
# supervisord config files
-install(FILES
- otdbtorataskstatuspropagator.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(otdbtorataskstatuspropagator.ini
+ DESTINATION supervisord.d)
diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt b/SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt
index 61bcf9738a7072d7dfd433d91a660c937a12077e..a498e9c120951e29793b9fc7d92d1348fb29e22d 100644
--- a/SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt
@@ -5,6 +5,5 @@ lofar_add_bin_scripts(
)
# supervisord config files
-install(FILES
- rataskspecifiedservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(rataskspecifiedservice.ini
+ DESTINATION supervisord.d)
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt
index fc5d95ef35794fa8943f6f07676e8e305ce616a6..3b7ce29529810501b6dbeb261e143ad48cb129fe 100644
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt
@@ -3,7 +3,6 @@
lofar_add_bin_scripts(rotspservice)
# supervisord config files
-install(FILES
- rotspservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(rotspservice.ini
+ DESTINATION supervisord.d)
diff --git a/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
index dc5f9aa8d197c62e3ad4b086fea006507b0a098b..471f70d701fb058dc227632e2bccba8bfe48bfa7 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
@@ -1,6 +1,6 @@
# $Id: CMakeLists.txt 30355 2014-11-04 13:46:05Z loose $
-lofar_package(ResourceAssigner 0.1 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services ResourceAssignmentService MoMQueryServiceClient ResourceAssignmentEstimator CleanupClient StorageQueryService MAC_Services MessageBus RACommon)
+lofar_package(ResourceAssigner 0.1 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services ResourceAssignmentService MoMQueryServiceClient ResourceAssignmentEstimator CleanupClient StorageQueryService MAC_Services RACommon)
include(PythonInstall)
set(USE_PYTHON_COMPILATION Off)
diff --git a/SAS/ResourceAssignment/ResourceAssigner/bin/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssigner/bin/CMakeLists.txt
index 13b5a2fc8f346242cb0442295acc79a62d09ebb6..a860d72c8d5105b62dcef737b7bbeaf1456d57c8 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssigner/bin/CMakeLists.txt
@@ -3,7 +3,6 @@
lofar_add_bin_scripts(resourceassigner)
# supervisord config files
-install(FILES
- resourceassigner.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(resourceassigner.ini
+ DESTINATION supervisord.d)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt
index a26dc94c2967c204374d4866ba1f3a9c5446bf95..0e4b21e5fe04c74fb2615bc00896c583036f2d87 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt
@@ -18,19 +18,15 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/database)
lofar_add_bin_scripts(radbpglistener)
# supervisord config files
-install(FILES
- radbpglistener.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(radbpglistener.ini
+ DESTINATION supervisord.d)
-add_subdirectory(radb/sql)
-add_subdirectory(tests)
-
-# symmetric install of sql with symlinks in build share/... and normal install in installed/share/...
set(sql_files radb/sql/add_notifications.sql
radb/sql/add_functions_and_triggers.sql
radb/sql/add_resource_allocation_statics.sql
radb/sql/add_virtual_instrument.sql
radb/sql/create_database.sql
radb/sql/create_and_populate_database.sql)
-
lofar_add_data_files(${sql_files})
+
+add_subdirectory(tests)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt
deleted file mode 100644
index d0443398bad2a8ca891f2d43956776ce0dcfcf8e..0000000000000000000000000000000000000000
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id: CMakeLists.txt 32341 2015-08-28 11:59:26Z schaap $
-
-set(sql_files add_notifications.sql
- add_functions_and_triggers.sql
- add_resource_allocation_statics.sql
- add_virtual_instrument.sql
- create_database.sql
- create_and_populate_database.sql
- README)
-
-install_files(/share/radb/sql FILES ${sql_files})
-
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/bin/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentEditor/bin/CMakeLists.txt
index 048414d3121e935e7d6132b24d8cff1359f6bd9a..bbc683af8c48dfd2c8cf5e3e9f70894bc308c79a 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/bin/CMakeLists.txt
@@ -3,7 +3,6 @@
lofar_add_bin_scripts(raewebservice)
# supervisord config files
-install(FILES
- raewebservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(raewebservice.ini
+ DESTINATION supervisord.d)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt
index 3d46e35f413c4b9bab3783153612ba50513f753c..9fce6bb80b9cac17b0d972b00cf304fa77d2f3cb 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt
@@ -1,5 +1,7 @@
# $Id$
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
python_install(
__init__.py
webservice.py
@@ -82,6 +84,12 @@ foreach(web_file ${web_files})
file(MAKE_DIRECTORY ${_build_dir}/${web_file_path})
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${web_file_abs} ${_build_dir}/${web_file})
- install(FILES ${web_file_abs} DESTINATION ${PYTHON_INSTALL_DIR}/lofar/sas/resourceassignment/resourceassignmenteditor/${web_file_path})
+ install(FILES ${web_file_abs}
+ DESTINATION ${PYTHON_INSTALL_DIR}/lofar/sas/resourceassignment/resourceassignmenteditor/${web_file_path}
+ COMPONENT ${lower_package_name})
endforeach(web_file ${web_files})
+
+
+
+
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEstimator/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentEstimator/CMakeLists.txt
index 8e2a8a9173b103496399c60ae192bde111c35e77..4e63fdec4b2d3bba26d33ab3b853fa52619aa881 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEstimator/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentEstimator/CMakeLists.txt
@@ -16,9 +16,8 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/resourceass
lofar_add_bin_scripts(raestimatorservice)
# supervisord config files
-install(FILES
- raestimatorservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(raestimatorservice.ini
+ DESTINATION supervisord.d)
#add_subdirectory(lib)
add_subdirectory(test)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentService/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentService/CMakeLists.txt
index 96e34ae101c9363212a5aa7e292ddbed4f8c3a3f..59bb5c9dd94c70805e6a1f5a4359ff9f0a414aac 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentService/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentService/CMakeLists.txt
@@ -17,8 +17,7 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/resourceass
lofar_add_bin_scripts(radbservice radbclient)
# supervisord config files
-install(FILES
- radbservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(radbservice.ini
+ DESTINATION supervisord.d)
add_subdirectory(test)
diff --git a/SAS/ResourceAssignment/SystemStatusDatabase/sql/CMakeLists.txt b/SAS/ResourceAssignment/SystemStatusDatabase/sql/CMakeLists.txt
index e12c38bca968c81bb0d306e3fe5092ae92d83eb2..6692111d0a246ea4dedf968d75962a5ba42b9a1d 100644
--- a/SAS/ResourceAssignment/SystemStatusDatabase/sql/CMakeLists.txt
+++ b/SAS/ResourceAssignment/SystemStatusDatabase/sql/CMakeLists.txt
@@ -2,5 +2,5 @@
set(sql_files SetupDatabase.sql)
-install_files(/share/ssdb/sql FILES ${sql_files})
+lofar_add_data_files(${sql_files} DESTINATION ssdb/sql)
diff --git a/SAS/ResourceAssignment/SystemStatusService/CMakeLists.txt b/SAS/ResourceAssignment/SystemStatusService/CMakeLists.txt
index b075940401b54767091048829b47ddea7ad3393f..0e4bd3b6a6219d3bd80268c14dabc792e202ff37 100644
--- a/SAS/ResourceAssignment/SystemStatusService/CMakeLists.txt
+++ b/SAS/ResourceAssignment/SystemStatusService/CMakeLists.txt
@@ -17,8 +17,7 @@ python_install(${_py_files} DESTINATION lofar/sas/systemstatus/service)
lofar_add_bin_scripts(ssdbservice)
# supervisord config files
-install(FILES
- ssdbservice.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(ssdbservice.ini
+ DESTINATION supervisord.d)
add_subdirectory(test)
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt b/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
index 0249d035e0f4c592cfc4dcf7ee4d11f7ac63becc..a4b4f82ac7302899d7f34af0c32f46bcc2587887 100644
--- a/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
+++ b/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
@@ -15,9 +15,8 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/taskpresche
lofar_add_bin_scripts(taskprescheduler)
# supervisord config files
-install(FILES
- taskprescheduler.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(taskprescheduler.ini
+ DESTINATION supervisord.d)
add_subdirectory(lib)
add_subdirectory(test)
diff --git a/SAS/SpecificationServices/CMakeLists.txt b/SAS/SpecificationServices/CMakeLists.txt
index fa79dd8322180604e7669597f1b96d9a9858b360..bedbd1e4a457e810f396493eece06527ad7ebe93 100644
--- a/SAS/SpecificationServices/CMakeLists.txt
+++ b/SAS/SpecificationServices/CMakeLists.txt
@@ -1,5 +1,5 @@
lofar_find_package(Python 2.7 REQUIRED)
-lofar_package(SpecificationServices 0.1 DEPENDS PyMessaging MoMQueryService MessageBus XSD)
+lofar_package(SpecificationServices 0.1 DEPENDS PyMessaging MoMQueryService XSD)
include(PythonInstall)
diff --git a/SAS/SpecificationServices/bin/CMakeLists.txt b/SAS/SpecificationServices/bin/CMakeLists.txt
index 8639e583a2ffe7464e04613ef54654e379d34e0a..c500526cfd5feeb38c255c71df03670a3ebdc31e 100644
--- a/SAS/SpecificationServices/bin/CMakeLists.txt
+++ b/SAS/SpecificationServices/bin/CMakeLists.txt
@@ -3,8 +3,7 @@ lofar_add_bin_scripts(specificationtranslationservice)
lofar_add_bin_scripts(specificationvalidationservice)
# supervisord config files
-install(FILES
- specificationservice.ini
+lofar_add_sysconf_files(specificationservice.ini
specificationtranslationservice.ini
specificationvalidationservice.ini
- DESTINATION etc/supervisord.d)
+ DESTINATION supervisord.d)
diff --git a/SAS/TriggerEmailService/Server/bin/CMakeLists.txt b/SAS/TriggerEmailService/Server/bin/CMakeLists.txt
index b0e0ecf735357f92fc18bc02a2110684ddb9a780..f201c3d0076a524b8f56b584b054f86a2dc65802 100644
--- a/SAS/TriggerEmailService/Server/bin/CMakeLists.txt
+++ b/SAS/TriggerEmailService/Server/bin/CMakeLists.txt
@@ -2,6 +2,5 @@
lofar_add_bin_scripts(TriggerEmailService)
# supervisord config files
-install(FILES
- TriggerEmailService.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(TriggerEmailService.ini
+ DESTINATION supervisord.d)
diff --git a/SAS/TriggerServices/bin/CMakeLists.txt b/SAS/TriggerServices/bin/CMakeLists.txt
index 1276efcecd501816c9692a47e2b7150fb5cf43db..8a12d41742e8afa1eecf21b4a92ee58abbd6fb6d 100644
--- a/SAS/TriggerServices/bin/CMakeLists.txt
+++ b/SAS/TriggerServices/bin/CMakeLists.txt
@@ -3,8 +3,7 @@ lofar_add_bin_scripts(triggerservice)
lofar_add_bin_scripts(triggercancellationservice)
# supervisord config files
-install(FILES
- triggerservice.ini
+lofar_add_sysconf_files(triggerservice.ini
triggercancellationservice.ini
- DESTINATION etc/supervisord.d)
+ DESTINATION supervisord.d)
diff --git a/SubSystems/DataManagement/CMakeLists.txt b/SubSystems/DataManagement/CMakeLists.txt
index cb7f4c1d21dcf5ba17a965ece4515203aea9caec..8c43cfc1080191f902a831ef00955addbbd280d1 100644
--- a/SubSystems/DataManagement/CMakeLists.txt
+++ b/SubSystems/DataManagement/CMakeLists.txt
@@ -7,6 +7,5 @@ lofar_package(DataManagement
ResourceTool)
# supervisord config files
-install(FILES
- DataManagement.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(DataManagement.ini
+ DESTINATION supervisord.d)
diff --git a/SubSystems/RAServices/CMakeLists.txt b/SubSystems/RAServices/CMakeLists.txt
index 631f77b6d7da5ddcbd7dd344185d5fc42496cac2..623c1768deb4b6845308ef53a674f127a779b1c1 100644
--- a/SubSystems/RAServices/CMakeLists.txt
+++ b/SubSystems/RAServices/CMakeLists.txt
@@ -21,10 +21,9 @@ lofar_package(RAServices
QPIDInfrastructure
RAScripts
StaticMetaData
- RACommon
- LSMR)
+ RACommon)
+ #LSMR)
# supervisord config files
-install(FILES
- RAServices.ini
- DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(RAServices.ini
+ DESTINATION supervisord.d)