[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24883 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24883 - gnunet/src/util |
Date: |
Sat, 10 Nov 2012 14:41:43 +0100 |
Author: grothoff
Date: 2012-11-10 14:41:43 +0100 (Sat, 10 Nov 2012)
New Revision: 24883
Modified:
gnunet/src/util/os_installation.c
Log:
trying to fix #2645 -- support lib64/gnunet/libexec/ installations
Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c 2012-11-10 10:29:35 UTC (rev 24882)
+++ gnunet/src/util/os_installation.c 2012-11-10 13:41:43 UTC (rev 24883)
@@ -143,6 +143,7 @@
return TRUE;
}
+
/**
* Try to determine path with win32-specific function
*
@@ -490,7 +491,8 @@
((0 == strcasecmp (&execpath[n - 5], "lib32")) ||
(0 == strcasecmp (&execpath[n - 5], "lib64"))))
{
- if (GNUNET_OS_IPK_LIBDIR != dirkind)
+ if ( (GNUNET_OS_IPK_LIBDIR != dirkind) &&
+ (GNUNET_OS_IPK_LIBEXECDIR != dirkind) )
{
/* strip '/lib32' or '/lib64' */
execpath[n - 5] = '\0';
@@ -544,9 +546,14 @@
"gnunet" DIR_SEPARATOR_STR;
break;
case GNUNET_OS_IPK_LIBEXECDIR:
- dirname =
+ if (isbasedir)
+ dirname =
DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR \
"libexec" DIR_SEPARATOR_STR;
+ else
+ dirname =
+ DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR \
+ "libexec" DIR_SEPARATOR_STR;
break;
default:
GNUNET_free (execpath);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24883 - gnunet/src/util,
gnunet <=