BugID: 163

Changed the makefile.am files and where necessary the configure.in files

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

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

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

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

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
 	

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

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

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
 	

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

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

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
 	

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