diff --git a/RTCP/Storage/src/Storage_main.cc b/RTCP/Storage/src/Storage_main.cc
index a081b85b5be5604663bb51af5c8c20bca7bb261e..3ca675885806edb8f4b34ed3c47f95a882c148bc 100644
--- a/RTCP/Storage/src/Storage_main.cc
+++ b/RTCP/Storage/src/Storage_main.cc
@@ -27,6 +27,7 @@
 #include <sys/select.h>
 #include <unistd.h>
 #include <cstdio>
+#include <cstdlib>
 
 #include <stdexcept>
 #include <string>
@@ -107,7 +108,7 @@ void ExitOnClosedStdin::mainLoop()
 int main(int argc, char *argv[])
 {
 #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
   #error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
   Context::initialize();
diff --git a/RTCP/Storage/src/plotMS.cc b/RTCP/Storage/src/plotMS.cc
index 945b45fd1d8c77064d1bf07d86e8018b56756e22..48d2ec5ac7fbfe669ff8429d2304d5446d3f4bfa 100644
--- a/RTCP/Storage/src/plotMS.cc
+++ b/RTCP/Storage/src/plotMS.cc
@@ -18,6 +18,7 @@
 #include <Common/DataConvert.h>
 #include <string>
 #include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 
 #include <casa/IO/AipsIO.h>
@@ -53,7 +54,7 @@ static void usage(char *progname, int exitcode)
 int main(int argc, char *argv[])
 {
 #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
   #error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
   Context::initialize();
diff --git a/lofar_config.h.cmake b/lofar_config.h.cmake
index 49c513484d86c1db4b20e66b172705cc4f65d4d4..54cb374ec7e75828e7e77cea62d7f25911e23935 100644
--- a/lofar_config.h.cmake
+++ b/lofar_config.h.cmake
@@ -1,12 +1,5 @@
 /* $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          |
 \*-------------------------------------------------------------------------*/