aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-02-02 09:42:51 +0000
committerChristian Grothoff <christian@grothoff.org>2014-02-02 09:42:51 +0000
commitd45fe4fcc5476f048327bcc2d385d1d4d632b89d (patch)
tree360661433c2d1a5dee1068a22b447b360c20e310
parent6bcb9ff24aec55e9614bd8b404582657af6da5db (diff)
downloadgnunet-gtk-d45fe4fcc5476f048327bcc2d385d1d4d632b89d.tar.gz
gnunet-gtk-d45fe4fcc5476f048327bcc2d385d1d4d632b89d.zip
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.
-rw-r--r--src/lib/os_installation.c9
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)
535 case GNUNET_OS_IPK_LIBDIR: 535 case GNUNET_OS_IPK_LIBDIR:
536 if (isbasedir) 536 if (isbasedir)
537 { 537 {
538 dirname =
539 DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "libexec" DIR_SEPARATOR_STR;
540 GNUNET_asprintf (&tmp, 538 GNUNET_asprintf (&tmp,
541 "%s%s%s%s", 539 "%s%s%s%s%s",
542 execpath, 540 execpath,
543 DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR, 541 DIR_SEPARATOR_STR "lib",
542 (NULL != multiarch) ? DIR_SEPARATOR_STR : "",
544 (NULL != multiarch) ? multiarch : "", 543 (NULL != multiarch) ? multiarch : "",
545 dirname); 544 DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR);
546 if (GNUNET_YES == 545 if (GNUNET_YES ==
547 GNUNET_DISK_directory_test (tmp, GNUNET_YES)) 546 GNUNET_DISK_directory_test (tmp, GNUNET_YES))
548 { 547 {