[GNUnet-SVN] r3110 - in GNUnet: . src/include src/setup src/util/os

[durner]

Author: durner
Date: 2006-07-09 07:26:52 -0700 (Sun, 09 Jul 2006)
New Revision: 3110

Modified:
   GNUnet/configure.ac
   GNUnet/src/include/gnunet_util_os.h
   GNUnet/src/setup/glade_support.c
   GNUnet/src/setup/gnunet-setup.c
   GNUnet/src/util/os/installpath.c
Log:
rename DATADIR due to name collision under Windows

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-07-09 13:52:06 UTC (rev 3109)
+++ GNUnet/configure.ac 2006-07-09 14:26:52 UTC (rev 3110)
@@ -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 
+#AC_DEFINE_DIR([GNDATADIR], [datadir/GNUnet/], [The directory for 
 #installing read-only architecture-independent data])
 #AC_DEFINE_DIR([LOCALEDIR], [datadir/locale/], [gettext catalogs])
 

Modified: GNUnet/src/include/gnunet_util_os.h
===================================================================
--- GNUnet/src/include/gnunet_util_os.h 2006-07-09 13:52:06 UTC (rev 3109)
+++ GNUnet/src/include/gnunet_util_os.h 2006-07-09 14:26:52 UTC (rev 3110)
@@ -248,7 +248,7 @@
   PREFIX,
   BINDIR,
   LIBDIR,
-  DATADIR,
+  GNDATADIR,
   PACKAGEDATADIR,
   LOCALEDIR };
 

Modified: GNUnet/src/setup/glade_support.c
===================================================================
--- GNUnet/src/setup/glade_support.c    2006-07-09 13:52:06 UTC (rev 3109)
+++ GNUnet/src/setup/glade_support.c    2006-07-09 14:26:52 UTC (rev 3110)
@@ -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: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c     2006-07-09 13:52:06 UTC (rev 3109)
+++ GNUnet/src/setup/gnunet-setup.c     2006-07-09 14:26:52 UTC (rev 3110)
@@ -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: GNUnet/src/util/os/installpath.c
===================================================================
--- GNUnet/src/util/os/installpath.c    2006-07-09 13:52:06 UTC (rev 3109)
+++ GNUnet/src/util/os/installpath.c    2006-07-09 14:26:52 UTC (rev 3110)
@@ -239,7 +239,7 @@
     case LIBDIR:
       dirname = STRDUP("lib/\0");
       break;
-    case DATADIR:
+    case GNDATADIR:
       dirname = STRDUP("share/\0");
       break;
     case PACKAGEDATADIR: