1 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/os_installation.c b/src/lib/os_installation.c
index 9af79993..a7615119 100644
--- a/src/lib/os_installation.c
+++ b/src/lib/os_installation.c
@@ -535,14 +535,13 @@ GNUNET_GTK_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
   case GNUNET_OS_IPK_LIBDIR:
     if (isbasedir)
     {
-      dirname =
-        DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "libexec" DIR_SEPARATOR_STR;
       GNUNET_asprintf (&tmp,
-                       "%s%s%s%s",
+                       "%s%s%s%s%s",
                        execpath,
-                       DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR,
+                       DIR_SEPARATOR_STR "lib",
+                       (NULL != multiarch) ? DIR_SEPARATOR_STR : "",
                        (NULL != multiarch) ? multiarch : "",
-                       dirname);
+                       DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR);
       if (GNUNET_YES ==
           GNUNET_DISK_directory_test (tmp, GNUNET_YES))
       {