Skip to content
Snippets Groups Projects
Commit 28eb080b authored by Marcel Loose's avatar Marcel Loose :sunglasses:
Browse files

Task #3000: Applied the proposed patch.

parent e7d76ec8
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <sys/select.h> #include <sys/select.h>
#include <unistd.h> #include <unistd.h>
#include <cstdio> #include <cstdio>
#include <cstdlib>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
...@@ -107,7 +108,7 @@ void ExitOnClosedStdin::mainLoop() ...@@ -107,7 +108,7 @@ void ExitOnClosedStdin::mainLoop()
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#if defined HAVE_LOG4CPLUS #if defined HAVE_LOG4CPLUS
INIT_LOGGER( CMAKE_INSTALL_PREFIX "/etc/Storage_main.log_prop" ); INIT_LOGGER(string(getenv("LOFARROOT") ? : ".") + "/etc/Storage_main.log_prop");
#elif defined HAVE_LOG4CXX #elif defined HAVE_LOG4CXX
#error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it #error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
Context::initialize(); Context::initialize();
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <Common/DataConvert.h> #include <Common/DataConvert.h>
#include <string> #include <string>
#include <cstdio> #include <cstdio>
#include <cstdlib>
#include <unistd.h> #include <unistd.h>
#include <casa/IO/AipsIO.h> #include <casa/IO/AipsIO.h>
...@@ -53,7 +54,7 @@ static void usage(char *progname, int exitcode) ...@@ -53,7 +54,7 @@ static void usage(char *progname, int exitcode)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#if defined HAVE_LOG4CPLUS #if defined HAVE_LOG4CPLUS
INIT_LOGGER( CMAKE_INSTALL_PREFIX "/etc/Storage.log_prop" ); INIT_LOGGER(string(getenv("LOFARROOT") ? : ".") + "/etc/Storage.log_prop");
#elif defined HAVE_LOG4CXX #elif defined HAVE_LOG4CXX
#error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it #error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
Context::initialize(); Context::initialize();
......
/* $Id$ */ /* $Id$ */
/*-------------------------------------------------------------------------*\
| Defines installation information |
\*-------------------------------------------------------------------------*/
/* Define the destination root directory into which the software will be installed */
#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
/*-------------------------------------------------------------------------*\ /*-------------------------------------------------------------------------*\
| Defines for the presence or absence of (system) header files | | Defines for the presence or absence of (system) header files |
\*-------------------------------------------------------------------------*/ \*-------------------------------------------------------------------------*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment