diff --git a/MAC/APL/APLCommon/configure.in b/MAC/APL/APLCommon/configure.in index cc92423b970258de51b0d3305686bb3ac500de5b..3d323186e24ce466fdb64f5d19f902ce0d1d08fd 100644 --- a/MAC/APL/APLCommon/configure.in +++ b/MAC/APL/APLCommon/configure.in @@ -10,10 +10,6 @@ AM_INIT_AUTOMAKE(APLCommon, 1.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT -AC_DEFINE_UNQUOTED([ARA_SYSCONF],["${prefix}/etc"],[Path to ARA install prefix directory.]) -RSP_SYSCONF="${prefix}/etc" -AC_SUBST([ARA_SYSCONF]) - dnl Checks for programs. AC_PROG_AWK AC_PROG_YACC diff --git a/MAC/APL/PAC/_StationOperations/configure.in b/MAC/APL/PAC/_StationOperations/configure.in index 4379e36494225bcd063622a0a84e6966f2133fa0..23e3bab4b4935fd21ac441a706cc759c05ec34f6 100644 --- a/MAC/APL/PAC/_StationOperations/configure.in +++ b/MAC/APL/PAC/_StationOperations/configure.in @@ -10,10 +10,6 @@ AM_INIT_AUTOMAKE(StationOperations, 1.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT -AC_DEFINE_UNQUOTED([ASO_SYSCONF],["${prefix}/etc"],[Path to ASO install prefix directory.]) -ASO_SYSCONF="${prefix}/etc" -AC_SUBST([ASO_SYSCONF]) - dnl Checks for programs. AC_PROG_AWK AC_PROG_YACC diff --git a/MAC/APL/PAC/_StationReceptorGroup/configure.in b/MAC/APL/PAC/_StationReceptorGroup/configure.in index 169309527096dfe11e0298c769fd3f7a8df48f80..be3b99c8b30f663edfeb6be158c759b6eb9a35e8 100644 --- a/MAC/APL/PAC/_StationReceptorGroup/configure.in +++ b/MAC/APL/PAC/_StationReceptorGroup/configure.in @@ -10,10 +10,6 @@ AM_INIT_AUTOMAKE(StationReceptorGroup, 1.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT -AC_DEFINE_UNQUOTED([ASR_SYSCONF],["${prefix}/etc"],[Path to ASR install prefix directory.]) -ASR_SYSCONF="${prefix}/etc" -AC_SUBST([ASR_SYSCONF]) - dnl Checks for programs. AC_PROG_AWK AC_PROG_YACC diff --git a/MAC/APL/PAC/_StationStartDaemon/configure.in b/MAC/APL/PAC/_StationStartDaemon/configure.in index 766737e01b0aac978409f9149446f1d5cb6dfa25..53ce397bc62db4cd7ac97ef0ff022eec7c203b28 100644 --- a/MAC/APL/PAC/_StationStartDaemon/configure.in +++ b/MAC/APL/PAC/_StationStartDaemon/configure.in @@ -10,10 +10,6 @@ AM_INIT_AUTOMAKE(StationStartDaemon, 1.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT -AC_DEFINE_UNQUOTED([ASD_SYSCONF],["${prefix}/etc"],[Path to ASD install prefix directory.]) -ASD_SYSCONF="${prefix}/etc" -AC_SUBST([ASD_SYSCONF]) - dnl Checks for programs. AC_PROG_AWK AC_PROG_YACC diff --git a/MAC/APL/PAC/_StationStartDaemon/src/Makefile.am b/MAC/APL/PAC/_StationStartDaemon/src/Makefile.am index b87219342b5d01267f8a65f5707f6de2a0cf9c73..449fe9d9904daf072e7a8a3238dd56a01e8dbd36 100644 --- a/MAC/APL/PAC/_StationStartDaemon/src/Makefile.am +++ b/MAC/APL/PAC/_StationStartDaemon/src/Makefile.am @@ -19,9 +19,7 @@ BUILT_SOURCES = EXTRA_DIST = -#in case of make install these files will be copied to the bindir beside the test apps -configfilesdir=$(bindir) -configfiles_DATA = \ +sysconf_DATA= \ StationStartDaemon.conf \ StationStartDaemon.log_prop diff --git a/MAC/APL/PAC/_VirtualTelescope/configure.in b/MAC/APL/PAC/_VirtualTelescope/configure.in index 44bf69de91ea15cf34a6bb2bb09cea0c39f6c1db..b69023fd450af039187ee20a5646f070a29b2894 100644 --- a/MAC/APL/PAC/_VirtualTelescope/configure.in +++ b/MAC/APL/PAC/_VirtualTelescope/configure.in @@ -10,10 +10,6 @@ AM_INIT_AUTOMAKE(VirtualTelescope, 1.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT -AC_DEFINE_UNQUOTED([AVT_SYSCONF],["${prefix}/etc"],[Path to AVT install prefix directory.]) -AVT_SYSCONF="${prefix}/etc" -AC_SUBST([AVT_SYSCONF]) - dnl Checks for programs. AC_PROG_AWK AC_PROG_YACC diff --git a/MAC/APL/_GSO/MACScheduler/configure.in b/MAC/APL/_GSO/MACScheduler/configure.in index d43c91ecdcb1a51172a9979a19832043cc36c528..22b7e26518659b5b255c3f2a8615de65d36ec52d 100644 --- a/MAC/APL/_GSO/MACScheduler/configure.in +++ b/MAC/APL/_GSO/MACScheduler/configure.in @@ -10,10 +10,6 @@ AM_INIT_AUTOMAKE(MACScheduler, 1.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT -AC_DEFINE_UNQUOTED([AMS_SYSCONF],["${prefix}/etc"],[Path to AMS install prefix directory.]) -AMS_SYSCONF="${prefix}/etc" -AC_SUBST([AMS_SYSCONF]) - dnl Checks for programs. AC_PROG_AWK AC_PROG_YACC diff --git a/MAC/APL/_GSO/MACScheduler/src/Makefile.am b/MAC/APL/_GSO/MACScheduler/src/Makefile.am index dc0bf055facf05479db8db6716a8dc8daf39c72c..4c5918e2e04d9f4a5139ec2907adecd98b304aa6 100644 --- a/MAC/APL/_GSO/MACScheduler/src/Makefile.am +++ b/MAC/APL/_GSO/MACScheduler/src/Makefile.am @@ -33,7 +33,9 @@ EXTRA_DIST = \ #in case of make install these files will be copied to the bindir beside the test apps configfilesdir=$(bindir) configfiles_DATA = \ - customPrepPVSSDB.ctl \ + customPrepPVSSDB.ctl + +sysconf_DATA= \ MACScheduler.conf \ MACScheduler.log_prop diff --git a/MAC/APL/_VIC/ArrayOperations/configure.in b/MAC/APL/_VIC/ArrayOperations/configure.in index 9f9102aa291c08c757048bc9fa4558179efa4ed6..1e9519c5238090cba9f205362822156dbef3b212 100644 --- a/MAC/APL/_VIC/ArrayOperations/configure.in +++ b/MAC/APL/_VIC/ArrayOperations/configure.in @@ -10,10 +10,6 @@ AM_INIT_AUTOMAKE(ArrayOperations, 1.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT -AC_DEFINE_UNQUOTED([AAO_SYSCONF],["${prefix}/etc"],[Path to AAO install prefix directory.]) -AAO_SYSCONF="${prefix}/etc" -AC_SUBST([AAO_SYSCONF]) - dnl Checks for programs. AC_PROG_AWK AC_PROG_YACC diff --git a/MAC/APL/_VIC/ArrayReceptorGroup/configure.in b/MAC/APL/_VIC/ArrayReceptorGroup/configure.in index 30b849ec501a45467c31fb7a71cdd9f4451b4bb7..c18fad7c71aa142ed1031d80f70c604e1d455b78 100644 --- a/MAC/APL/_VIC/ArrayReceptorGroup/configure.in +++ b/MAC/APL/_VIC/ArrayReceptorGroup/configure.in @@ -10,10 +10,6 @@ AM_INIT_AUTOMAKE(ArrayReceptorGroup, 1.0) dnl Initialize for LOFAR (may set compilers) lofar_INIT -AC_DEFINE_UNQUOTED([AAR_SYSCONF],["${prefix}/etc"],[Path to AAR install prefix directory.]) -AAR_SYSCONF="${prefix}/etc" -AC_SUBST([AAR_SYSCONF]) - dnl Checks for programs. AC_PROG_AWK AC_PROG_YACC diff --git a/MAC/APL/_VIC/VirtualInstrument/src/Makefile.am b/MAC/APL/_VIC/VirtualInstrument/src/Makefile.am index fce3f41dcf61b88b0c2b93e3116c1bc187d4594d..6a3908317619f360ea42ee8bbcb1e937cb52b1c4 100644 --- a/MAC/APL/_VIC/VirtualInstrument/src/Makefile.am +++ b/MAC/APL/_VIC/VirtualInstrument/src/Makefile.am @@ -22,9 +22,7 @@ BUILT_SOURCES = EXTRA_DIST = -#in case of make install these files will be copied to the bindir beside the test apps -configfilesdir=$(bindir) -configfiles_DATA = \ +sysconf_DATA= \ VirtualInstrument.conf \ VirtualInstrument.log_prop diff --git a/MAC/APL/_VIC/VirtualInstrument/test/Makefile.am b/MAC/APL/_VIC/VirtualInstrument/test/Makefile.am index 726fd1a13543eeea3873a5a6ac38e8a3b3f521cb..5020551cc6ef136e065bf58ecc320c8f08fa3eb6 100644 --- a/MAC/APL/_VIC/VirtualInstrument/test/Makefile.am +++ b/MAC/APL/_VIC/VirtualInstrument/test/Makefile.am @@ -19,9 +19,7 @@ BUILT_SOURCES = EXTRA_DIST = -#in case of make install these files will be copied to the bindir beside the test apps -configfilesdir=$(bindir) -configfiles_DATA = \ +sysconf_DATA= \ avitest.conf \ avitest.log_prop