Task #4126: Merge with trunk for ObservationControl.conf install problem

.gitattributes

@@ -2491,7 +2491,7 @@ MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h -text
 MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc -text
 MAC/APL/MainCU/src/CRTriggerControl/crctl.cc -text
 MAC/APL/MainCU/src/CRTriggerControl/crctl.h -text
-MAC/APL/MainCU/src/ObservationControl/ObservationControl.conf -text
+MAC/APL/MainCU/src/ObservationControl/ObservationControl.conf.in -text
 MAC/APL/PAC/Cal_Server/src/CS010C_HALF_positions.dat -text
 MAC/APL/PAC/Cal_Server/src/CS010C_positions.dat -text
 MAC/APL/PAC/IBS_Protocol/src/IBS_Protocol.prot -text

MAC/APL/MainCU/src/ObservationControl/CMakeLists.txt

@@ -4,6 +4,10 @@ lofar_add_bin_program(ObservationControl
   ObservationControlMain.cc
   ObservationControl.cc)
 
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/ObservationControl.conf.in
+  ${CMAKE_CURRENT_BINARY_DIR}/ObservationControl.conf)
+
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/ObservationControl.conf
   DESTINATION etc)