Relocate the locale directory.

[pspp-builds.git] / src / ui / terminal / main.c

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 2f80cb57a3b06e5ad32e3071c0748895c87f9480..8acbdc2dde79d7bd1a8a97be24da76523bf0f928 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@
 #include <data/file-handle-def.h>
 #include <libpspp/getl.h>
 #include <data/file-name.h>
-#include <data/format.h>
 #include <data/procedure.h>
 #include <data/settings.h>
 #include <data/variable.h>
@@ -55,6 +54,7 @@
 
 #include "fatal-signal.h"
 #include "progname.h"
+#include "relocatable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -91,7 +91,6 @@ main (int argc, char **argv)
   fpu_init ();
   gsl_set_error_handler_off ();
 
-  fmt_init ();
   outp_init ();
   fn_init ();
   fh_init ();
@@ -110,7 +109,7 @@ main (int argc, char **argv)
   if (parse_command_line (argc, argv, the_source_stream))
     {
       msg_ui_init (the_source_stream);
-      if (!get_testing_mode ())
+      if (!settings_get_testing_mode ())
         outp_read_devices ();
       else
         outp_configure_driver_line (
@@ -152,7 +151,7 @@ i18n_init (void)
 #if HAVE_LC_PAPER
   setlocale (LC_PAPER, "");
 #endif
-  bindtextdomain (PACKAGE, locale_dir);
+  bindtextdomain (PACKAGE, relocate (locale_dir));
   textdomain (PACKAGE);
 #endif /* ENABLE_NLS */
 }
@@ -210,6 +209,5 @@ clean_up (void)
       readln_uninitialize ();
       outp_done ();
       msg_ui_done ();
-      fmt_done ();
     }
 }