From 94e4d90d00440fee082ea6afa4b5f6b62f97186f Mon Sep 17 00:00:00 2001
From: blaakmeer <sdos@astron.nl>
Date: Tue, 13 Sep 2005 07:28:30 +0000
Subject: [PATCH] BugID: 163 Changed the makefile.am files and where necessary
the configure.in files
---
MAC/APL/APLCommon/configure.in | 4 ----
MAC/APL/PAC/_StationOperations/configure.in | 4 ----
MAC/APL/PAC/_StationReceptorGroup/configure.in | 4 ----
MAC/APL/PAC/_StationStartDaemon/configure.in | 4 ----
MAC/APL/PAC/_StationStartDaemon/src/Makefile.am | 4 +---
MAC/APL/PAC/_VirtualTelescope/configure.in | 4 ----
MAC/APL/_GSO/MACScheduler/configure.in | 4 ----
MAC/APL/_GSO/MACScheduler/src/Makefile.am | 4 +++-
MAC/APL/_VIC/ArrayOperations/configure.in | 4 ----
MAC/APL/_VIC/ArrayReceptorGroup/configure.in | 4 ----
MAC/APL/_VIC/VirtualInstrument/src/Makefile.am | 4 +---
MAC/APL/_VIC/VirtualInstrument/test/Makefile.am | 4 +---
12 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/MAC/APL/APLCommon/configure.in b/MAC/APL/APLCommon/configure.in
index cc92423b970..3d323186e24 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 4379e364942..23e3bab4b49 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 16930952709..be3b99c8b30 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 766737e01b0..53ce397bc62 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 b87219342b5..449fe9d9904 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 44bf69de91e..b69023fd450 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 d43c91ecdcb..22b7e265186 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 dc0bf055fac..4c5918e2e04 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 9f9102aa291..1e9519c5238 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 30b849ec501..c18fad7c71a 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 fce3f41dcf6..6a390831761 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 726fd1a1354..5020551cc6e 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
--
GitLab