diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-12-25 14:45:41 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-12-25 14:45:41 +0000 |
commit | 1ae15ca957efa0f7e88ec37f3510b34e5ad0e06c (patch) | |
tree | 96b2ca4670a5fb5b3da9aa27f20d8c12febc343c /src | |
parent | e8d4e1edd97fb8cc6756a953681e1f6a2a5beb68 (diff) | |
download | gnunet-1ae15ca957efa0f7e88ec37f3510b34e5ad0e06c.tar.gz gnunet-1ae15ca957efa0f7e88ec37f3510b34e5ad0e06c.zip |
-LRN: add docdir to installation get path
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_os_lib.h | 14 | ||||
-rw-r--r-- | src/util/os_installation.c | 5 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index ff324e18a..944713606 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h | |||
@@ -66,12 +66,12 @@ enum GNUNET_OS_InstallationPathKind | |||
66 | GNUNET_OS_IPK_BINDIR, | 66 | GNUNET_OS_IPK_BINDIR, |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Return the directory where libraries are installed. (lib/) | 69 | * Return the directory where libraries are installed. (lib/gnunet/) |
70 | */ | 70 | */ |
71 | GNUNET_OS_IPK_LIBDIR, | 71 | GNUNET_OS_IPK_LIBDIR, |
72 | 72 | ||
73 | /** | 73 | /** |
74 | * Return the directory where data is installed (share/) | 74 | * Return the directory where data is installed (share/gnunet/) |
75 | */ | 75 | */ |
76 | GNUNET_OS_IPK_DATADIR, | 76 | GNUNET_OS_IPK_DATADIR, |
77 | 77 | ||
@@ -88,9 +88,15 @@ enum GNUNET_OS_InstallationPathKind | |||
88 | GNUNET_OS_IPK_SELF_PREFIX, | 88 | GNUNET_OS_IPK_SELF_PREFIX, |
89 | 89 | ||
90 | /** | 90 | /** |
91 | * Return the prefix of the path with application icons. | 91 | * Return the prefix of the path with application icons (share/icons/). |
92 | */ | 92 | */ |
93 | GNUNET_OS_IPK_ICONDIR | 93 | GNUNET_OS_IPK_ICONDIR, |
94 | |||
95 | /** | ||
96 | * Return the prefix of the path with documentation files, including the | ||
97 | * license (share/doc/gnunet/). | ||
98 | */ | ||
99 | GNUNET_OS_IPK_DOCDIR | ||
94 | }; | 100 | }; |
95 | 101 | ||
96 | 102 | ||
diff --git a/src/util/os_installation.c b/src/util/os_installation.c index a7a6ae915..c5cf1ccb3 100644 --- a/src/util/os_installation.c +++ b/src/util/os_installation.c | |||
@@ -421,6 +421,11 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind) | |||
421 | dirname = | 421 | dirname = |
422 | DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "icons" DIR_SEPARATOR_STR; | 422 | DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "icons" DIR_SEPARATOR_STR; |
423 | break; | 423 | break; |
424 | case GNUNET_OS_IPK_DOCDIR: | ||
425 | dirname = | ||
426 | DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "doc" DIR_SEPARATOR_STR \ | ||
427 | "gnunet" DIR_SEPARATOR_STR; | ||
428 | break; | ||
424 | default: | 429 | default: |
425 | GNUNET_free (execpath); | 430 | GNUNET_free (execpath); |
426 | return NULL; | 431 | return NULL; |