up

3 files changed, 8 insertions, 18 deletions

diff --git a/ABOUT-NLS b/ABOUT-NLS
deleted file mode 120000
index 270e2edc..00000000
--- a/ABOUT-NLS
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/gettext/ABOUT-NLS
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 738b74ba..98adc199 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,23 +228,13 @@ then
 fi
 
 
-# Set PACKAGE_LOCALE_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [locale dir])
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [locale dir])
-fi
+# We define the paths here, because MinGW/GCC expands paths
+# passed through the command line ("-DDATADIR=..."). This would
+# lead to hard-coded paths ("C:\mingw\mingw\bin...") that do
+# not contain the actual installation.
+AC_DEFINE_DIR([PACKAGE_DATA_DIR], [datadir/GNUnet], [The directory for installing read-only architecture-independent data])
+AC_DEFINE_DIR([PACKAGE_LOCALE_DIR], [datadir/locale], [gettext catalogs])
 
-# Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [data dir])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [data dir])
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [package data dir])
-fi
 
 # Set PACKAGE_SOURCE_DIR in config.h.
 packagesrcdir=`cd $srcdir && pwd`
diff --git a/src/core/main.c b/src/core/main.c
index 147ace7c..f3dedca7 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -98,7 +98,7 @@ int main(int argc,
                          argv, 
                          &parseOptions))
     return 0;
-  BINDTEXTDOMAIN(PACKAGE, PACKAGE_LOCALE_DIR);
+  BINDTEXTDOMAIN(PACKAGE_NAME, PACKAGE_LOCALE_DIR);
   textdomain(PACKAGE);
   startCron();
   initGNUnetGTKCommon();
@@ -113,6 +113,7 @@ int main(int argc,
   gtk_main();
   gdk_threads_leave(); 
   setCustomLogProc(NULL);
+  while (YES == gtkRunSomeSaveCalls()) ;    
   stopCron();
 
   doneGNUnetGTKCommon();