2 files changed, 5 insertions, 1 deletions

diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c
index 2caad8c05..07eeb98f0 100644
--- a/src/util/configuration_loader.c
+++ b/src/util/configuration_loader.c
@@ -43,8 +43,11 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
                            const char *filename)
 {
   char *baseconfig;
+  const char *base_config_varname;
 
-  if (NULL != (baseconfig = getenv ("GNUNET_BASE_CONFIG")))
+  base_config_varname = GNUNET_OS_project_data_get ()->base_config_varname;
+
+  if (NULL != (baseconfig = getenv (base_config_varname)))
   {
     baseconfig = GNUNET_strdup (baseconfig);
   }
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 45f5052aa..161b0535f 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -58,6 +58,7 @@ static const struct GNUNET_OS_ProjectData default_pd = {
   .project_dirname = "gnunet",
   .binary_name = "gnunet-arm",
   .env_varname = "GNUNET_PREFIX",
+  .base_config_varname = "GNUNET_BASE_CONFIG",
   .bug_email = "gnunet-developers@gnu.org",
   .homepage = "http://www.gnu.org/s/gnunet/",
   .config_file = "gnunet.conf",