Author: durner
Date: 2006-07-08 12:44:29 -0700 (Sat, 08 Jul 2006)
New Revision: 3104
Modified:
branches/GNUnet-0.7.0/configure.ac
branches/GNUnet-0.7.0/src/setup/glade_support.c
branches/GNUnet-0.7.0/src/setup/gnunet-setup.c
branches/GNUnet-0.7.0/src/util/configuration.c
Log:
rename DATADIR due to name conflict under Windows
Modified: branches/GNUnet-0.7.0/configure.ac
===================================================================
--- branches/GNUnet-0.7.0/configure.ac 2006-07-08 02:52:40 UTC (rev 3103)
+++ branches/GNUnet-0.7.0/configure.ac 2006-07-08 19:44:29 UTC (rev 3104)
@@ -134,11 +134,11 @@
AC_MSG_RESULT([$build_target])
# We define the paths here, because MinGW/GCC expands paths
-# passed through the command line ("-DDATADIR=..."). This would
+# passed through the command line ("-DGNDATADIR=..."). This would
# lead to hard-coded paths ("C:\mingw\mingw\bin...") that do
# not contain the actual GNUnet installation. GNUnet usually lives in
# "C:\Program Files\GNU\GNUnet\bin".
-AC_DEFINE_DIR([DATADIR], [datadir/GNUnet/], [The directory for installing
read-only architecture-independent data])
+AC_DEFINE_DIR([GNDATADIR], [datadir/GNUnet/], [The directory for installing
read-only architecture-independent data])
AC_DEFINE_DIR([LOCALEDIR], [datadir/locale/], [gettext catalogs])
Modified: branches/GNUnet-0.7.0/src/setup/glade_support.c
===================================================================
--- branches/GNUnet-0.7.0/src/setup/glade_support.c 2006-07-08 02:52:40 UTC
(rev 3103)
+++ branches/GNUnet-0.7.0/src/setup/glade_support.c 2006-07-08 19:44:29 UTC
(rev 3104)
@@ -47,10 +47,10 @@
#ifdef MINGW
gladeFile = MALLOC(_MAX_PATH + 1);
- plibc_conv_to_win_path(DATADIR"/wizard.glade",
+ plibc_conv_to_win_path(GNDATADIR"/wizard.glade",
gladeFile);
#else
- gladeFile = STRDUP(DATADIR"/wizard.glade");
+ gladeFile = STRDUP(GNDATADIR"/wizard.glade");
#endif
return gladeFile;
}
Modified: branches/GNUnet-0.7.0/src/setup/gnunet-setup.c
===================================================================
--- branches/GNUnet-0.7.0/src/setup/gnunet-setup.c 2006-07-08 02:52:40 UTC
(rev 3103)
+++ branches/GNUnet-0.7.0/src/setup/gnunet-setup.c 2006-07-08 19:44:29 UTC
(rev 3104)
@@ -132,7 +132,7 @@
}
}
FREENONNULL(setConfigurationString("FILES", "gnunet.conf", filename));
- conf_parse(DATADIR "/config-daemon.in");
+ conf_parse(GNDATADIR "/config-daemon.in");
}
else {
FREENONNULL(setConfigurationString("GNUNETD", "_MAGIC_", "NO"));
@@ -143,7 +143,7 @@
filename = expandFileName(DEFAULT_CLIENT_CONFIG_FILE);
}
FREENONNULL(setConfigurationString("FILES", "gnunet.conf", filename));
- conf_parse(DATADIR "/config-client.in");
+ conf_parse(GNDATADIR "/config-client.in");
}
dirname = STRDUP(filename);
Modified: branches/GNUnet-0.7.0/src/util/configuration.c
===================================================================
--- branches/GNUnet-0.7.0/src/util/configuration.c 2006-07-08 02:52:40 UTC
(rev 3103)
+++ branches/GNUnet-0.7.0/src/util/configuration.c 2006-07-08 19:44:29 UTC
(rev 3104)
@@ -441,7 +441,7 @@
parseConfigInit = YES;
- setConfigurationString("Meta", "DATADIR", DATADIR);
+ setConfigurationString("Meta", "DATADIR", GNDATADIR);
return YES;
}
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
