From d55ad73533a35c2af0d9e6a17149fa6785fa43e1 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 7 Jun 2017 09:50:45 +0000
Subject: [PATCH] Task #10913: Install all StaticMetaData files into
etc/StaticMetaData, fixing problems in MAC_install for the stations
---
.gitattributes | 1 -
.../data/StaticMetaData/CMakeLists.txt | 20 +++++++++----------
.../data/StaticMetaData/StaticMetaData | 1 -
3 files changed, 10 insertions(+), 12 deletions(-)
delete mode 120000 MAC/Deployment/data/StaticMetaData/StaticMetaData
diff --git a/.gitattributes b/.gitattributes
index d798c073f99..fbda6a14321 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3426,7 +3426,6 @@ MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat -text
MAC/Deployment/data/StaticMetaData/RSPDriver.conf.test -text
MAC/Deployment/data/StaticMetaData/RemoteStation.conf.test -text
MAC/Deployment/data/StaticMetaData/SourceCatalog.conf -text
-MAC/Deployment/data/StaticMetaData/StaticMetaData -text
MAC/Deployment/data/StaticMetaData/StationAttenuation.dat -text
MAC/Deployment/data/StaticMetaData/StationInfo.dat -text
MAC/Deployment/data/StaticMetaData/Storage+MAC.dat -text
diff --git a/MAC/Deployment/data/StaticMetaData/CMakeLists.txt b/MAC/Deployment/data/StaticMetaData/CMakeLists.txt
index aa733c417f2..71266e4b377 100644
--- a/MAC/Deployment/data/StaticMetaData/CMakeLists.txt
+++ b/MAC/Deployment/data/StaticMetaData/CMakeLists.txt
@@ -16,13 +16,13 @@ lofar_add_sysconf_files(
# relative dir as in the source, hence we've put a symlink
# StaticMetaData -> . in this directory.
file(GLOB staticmeta_data RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
- StaticMetaData/*.tmpl
- StaticMetaData/*.test
- StaticMetaData/*.dat
- StaticMetaData/AntennaArrays/*.conf*
- StaticMetaData/AntennaPos/*.conf*
- StaticMetaData/CableDelays/*.conf*
- StaticMetaData/iHBADeltas/*.conf*
- StaticMetaData/AntennaFields/*.conf*
- StaticMetaData/Attenuation/*.conf*)
-lofar_add_sysconf_files(${staticmeta_data})
+ *.tmpl
+ *.test
+ *.dat
+ AntennaArrays/*.conf*
+ AntennaPos/*.conf*
+ CableDelays/*.conf*
+ iHBADeltas/*.conf*
+ AntennaFields/*.conf*
+ Attenuation/*.conf*)
+lofar_add_sysconf_files(${staticmeta_data} DESTINATION StaticMetaData)
diff --git a/MAC/Deployment/data/StaticMetaData/StaticMetaData b/MAC/Deployment/data/StaticMetaData/StaticMetaData
deleted file mode 120000
index 945c9b46d68..00000000000
--- a/MAC/Deployment/data/StaticMetaData/StaticMetaData
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
--
GitLab