diff options
| author | Christian Grothoff <christian@grothoff.org> | 2014-01-30 14:47:20 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2014-01-30 14:47:20 +0000 |
| commit | f57cbab24fb7a22fc982eb8b6c4a2d18402be460 (patch) | |
| tree | aa04434af42c35c434a233e31a91da5800eeb098 /src/util/configuration.c | |
| parent | e4e2c54e62f4eeba2aa2db33bd9cf75e45d99c0c (diff) | |
| download | gnunet-f57cbab24fb7a22fc982eb8b6c4a2d18402be460.tar.gz gnunet-f57cbab24fb7a22fc982eb8b6c4a2d18402be460.zip | |
fix #3284: support lib/MULTIARCH/ paths in installation, use GNUNET_PREFIX=@libdir@ so that we can extract the value of MULTIARCH during 'make check'
Diffstat (limited to 'src/util/configuration.c')
| -rw-r--r-- | src/util/configuration.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/configuration.c b/src/util/configuration.c index ca27b5aef..3d9281e8d 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c | |||
| @@ -1632,7 +1632,7 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
| 1632 | char *ipath; | 1632 | char *ipath; |
| 1633 | 1633 | ||
| 1634 | ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR); | 1634 | ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR); |
| 1635 | if (ipath == NULL) | 1635 | if (NULL == ipath) |
| 1636 | return GNUNET_SYSERR; | 1636 | return GNUNET_SYSERR; |
| 1637 | baseconfig = NULL; | 1637 | baseconfig = NULL; |
| 1638 | GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d"); | 1638 | GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d"); |
| @@ -1644,7 +1644,7 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
| 1644 | return GNUNET_SYSERR; /* no configuration at all found */ | 1644 | return GNUNET_SYSERR; /* no configuration at all found */ |
| 1645 | } | 1645 | } |
| 1646 | GNUNET_free (baseconfig); | 1646 | GNUNET_free (baseconfig); |
| 1647 | if ((filename != NULL) && | 1647 | if ((NULL != filename) && |
| 1648 | (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, filename))) | 1648 | (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, filename))) |
| 1649 | { | 1649 | { |
| 1650 | /* specified configuration not found */ | 1650 | /* specified configuration not found */ |