[GNUnet-SVN] r18804 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2011-12-25 15:45:41 +0100 (Sun, 25 Dec 2011)
New Revision: 18804

Modified:
   gnunet/src/include/gnunet_os_lib.h
   gnunet/src/util/os_installation.c
Log:
-LRN: add docdir to installation get path

Modified: gnunet/src/include/gnunet_os_lib.h
===================================================================
--- gnunet/src/include/gnunet_os_lib.h  2011-12-24 21:46:49 UTC (rev 18803)
+++ gnunet/src/include/gnunet_os_lib.h  2011-12-25 14:45:41 UTC (rev 18804)
@@ -66,12 +66,12 @@
   GNUNET_OS_IPK_BINDIR,
 
   /**
-   * Return the directory where libraries are installed. (lib/)
+   * Return the directory where libraries are installed. (lib/gnunet/)
    */
   GNUNET_OS_IPK_LIBDIR,
 
   /**
-   * Return the directory where data is installed (share/)
+   * Return the directory where data is installed (share/gnunet/)
    */
   GNUNET_OS_IPK_DATADIR,
 
@@ -88,9 +88,15 @@
   GNUNET_OS_IPK_SELF_PREFIX,
 
   /**
-   * Return the prefix of the path with application icons.
+   * Return the prefix of the path with application icons (share/icons/).
    */
-  GNUNET_OS_IPK_ICONDIR
+  GNUNET_OS_IPK_ICONDIR,
+
+  /**
+   * Return the prefix of the path with documentation files, including the
+   * license (share/doc/gnunet/).
+   */
+  GNUNET_OS_IPK_DOCDIR
 };
 
 

Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c   2011-12-24 21:46:49 UTC (rev 18803)
+++ gnunet/src/util/os_installation.c   2011-12-25 14:45:41 UTC (rev 18804)
@@ -421,6 +421,11 @@
     dirname =
         DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "icons" DIR_SEPARATOR_STR;
     break;
+  case GNUNET_OS_IPK_DOCDIR:
+    dirname =
+        DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "doc" DIR_SEPARATOR_STR \
+        "gnunet" DIR_SEPARATOR_STR;
+    break;
   default:
     GNUNET_free (execpath);
     return NULL;