[GNUnet-SVN] r32146 - gnunet/src/util gnunet-gtk/src/lib

[gnunet]

Author: grothoff
Date: 2014-02-02 10:42:51 +0100 (Sun, 02 Feb 2014)
New Revision: 32146

Modified:
   gnunet-gtk/src/lib/os_installation.c
   gnunet/src/util/os_installation.c
Log:
Bertrand Marc wrote:

About issue #3284, there was still a little glitch in the LIBDIR case.
On my box, plugins are in /usr/lib/x86_64-linux-gnu/gnunet/. You'll find
attached a patch (against svn head) to fix it.


Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c   2014-02-02 09:42:14 UTC (rev 32145)
+++ gnunet/src/util/os_installation.c   2014-02-02 09:42:51 UTC (rev 32146)
@@ -541,13 +541,13 @@
   case GNUNET_OS_IPK_LIBDIR:
     if (isbasedir)
     {
-      dirname =
-          DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR;
       GNUNET_asprintf (&tmp,
-                       "%s%s%s",
+                       "%s%s%s%s%s",
                        execpath,
-                       dirname,
-                       (NULL != multiarch) ? multiarch : "");
+                       DIR_SEPARATOR_STR "lib",
+                       (NULL != multiarch) ? DIR_SEPARATOR_STR : "",
+                       (NULL != multiarch) ? multiarch : "",
+                       DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR);
       if (GNUNET_YES ==
           GNUNET_DISK_directory_test (tmp, GNUNET_YES))
       {

Modified: gnunet-gtk/src/lib/os_installation.c
===================================================================
--- gnunet-gtk/src/lib/os_installation.c        2014-02-02 09:42:14 UTC (rev 
32145)
+++ gnunet-gtk/src/lib/os_installation.c        2014-02-02 09:42:51 UTC (rev 
32146)
@@ -535,14 +535,13 @@
   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))
       {