[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8320 - in GNUnet: . contrib/macosx src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8320 - in GNUnet: . contrib/macosx src/include |
Date: |
Tue, 10 Mar 2009 04:27:05 -0600 |
Author: holindho
Date: 2009-03-10 04:27:04 -0600 (Tue, 10 Mar 2009)
New Revision: 8320
Modified:
GNUnet/configure.ac
GNUnet/contrib/macosx/build-osx-framework.sh
GNUnet/src/include/gnunet_directories.h.in
Log:
os x likes to store preferences in a separate dir
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2009-03-10 10:24:21 UTC (rev 8319)
+++ GNUnet/configure.ac 2009-03-10 10:27:04 UTC (rev 8320)
@@ -948,6 +948,13 @@
[default daemon home directory (/var/lib/gnunet)]),
[gn_daemon_home_dir=$withval])
AC_SUBST(GN_DAEMON_HOME_DIR, $gn_daemon_home_dir)
+gn_user_config_dir="~/.gnunet"
+AC_ARG_WITH(user-config-dir,
+ AC_HELP_STRING(
+ [--with-user-config-dir=DIR],
+ [default user config directory (~/.gnunet)]),
+ [gn_user_config_dir=$withval])
+AC_SUBST(GN_USER_CONFIG_DIR, $gn_user_config_dir)
gn_daemon_config_dir="/etc"
AC_ARG_WITH(daemon-config-dir,
AC_HELP_STRING(
Modified: GNUnet/contrib/macosx/build-osx-framework.sh
===================================================================
--- GNUnet/contrib/macosx/build-osx-framework.sh 2009-03-10 10:24:21 UTC
(rev 8319)
+++ GNUnet/contrib/macosx/build-osx-framework.sh 2009-03-10 10:27:04 UTC
(rev 8320)
@@ -516,6 +516,7 @@
--prefix="${FW_DIR}" \
--with-user-home-dir="~/Library/GNUnet" \
--with-daemon-home-dir="/Library/GNUnet" \
+ --with-user-config-dir="~/Library/Preferences" \
--with-daemon-config-dir="/Library/Preferences" \
--with-user-config-name="org.gnunet.gnunet.conf" \
--with-daemon-config-name="org.gnunet.gnunetd.conf" \
Modified: GNUnet/src/include/gnunet_directories.h.in
===================================================================
--- GNUnet/src/include/gnunet_directories.h.in 2009-03-10 10:24:21 UTC (rev
8319)
+++ GNUnet/src/include/gnunet_directories.h.in 2009-03-10 10:27:04 UTC (rev
8320)
@@ -28,7 +28,7 @@
#ifndef GNUNET_DIRECTORIES
#define GNUNET_DIRECTORIES
-#define GNUNET_DEFAULT_CLIENT_CONFIG_FILE
"@GN_USER_HOME_DIR@/@GN_USER_CONFIG_NAME@"
+#define GNUNET_DEFAULT_CLIENT_CONFIG_FILE
"@GN_USER_CONFIG_DIR@/@GN_USER_CONFIG_NAME@"
#define GNUNET_DEFAULT_CLIENT_SITE_CONFIG_FILE
"@GN_DAEMON_CONFIG_DIR@/@GN_USER_CONFIG_NAME@"
#define GNUNET_DEFAULT_DAEMON_CONFIG_FILE
"@GN_DAEMON_CONFIG_DIR@/@GN_DAEMON_CONFIG_NAME@"
#define GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY "$GNUNETD_HOME"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8320 - in GNUnet: . contrib/macosx src/include,
gnunet <=