hopefully fix tex2lyx linking.

[lyx.git] / src / support / package.C.in

diff --git a/src/support/package.C.in b/src/support/package.C.in
index dd35c5d969834eb2c29f2657a88816b58570591a..f666e6eceb9a3852e011f4004704bda9b7e2b347 100644 (file)
--- a/src/support/package.C.in
+++ b/src/support/package.C.in
@@ -44,10 +44,6 @@
 # include <CoreServices/CoreServices.h> // FSFindFolder, FSRefMakePath
 #endif
 
-#ifndef PATH_MAX
-# define PATH_MAX 256
-#endif
-
 using std::string;
 
 namespace fs = boost::filesystem;
@@ -153,7 +149,7 @@ Package::Package(string const & command_line_arg0,
 
        string const configure_script = addName(system_support(), "configure.py");
        configure_command_ = os::python() + ' ' + quoteName(configure_script)
-                                      + with_version_suffix();
+                                      + with_version_suffix();
 
        lyxerr[Debug::INIT]
                << "<package>\n"
@@ -361,8 +357,8 @@ string const get_temp_dir()
 {
 #if defined (USE_WINDOWS_PACKAGING)
        // Typical example: C:/TEMP/.
-       char path[PATH_MAX];
-       GetTempPath(PATH_MAX, path);
+       char path[MAX_PATH];
+       GetTempPath(MAX_PATH, path);
        return os::internal_path(path);
 #else // Posix-like.
        return "/tmp";
@@ -440,9 +436,10 @@ string const abs_path_from_binary_name(string const & exe)
 {
        string const abs_binary = get_binary_path(exe);
        if (abs_binary.empty()) {
-               lyxerr << bformat(_("Unable to determine the path to the "
-                                   "LyX binary from the command line %1$s"),
-                                 exe)
+               // FIXME UNICODE
+               lyxerr << lyx::to_utf8(bformat(_("Unable to determine the path to the "
+                                                "LyX binary from the command line %1$s"),
+                                                lyx::from_utf8(exe)))
                       << std::endl;
                bail_out();
        }
@@ -561,14 +558,15 @@ get_system_support_dir(string const & abs_binary,
                searched_dirs_str += *it;
        }
 
-       lyxerr << bformat(_("Unable to determine the system directory "
-                           "having searched\n"
-                           "\t%1$s\n"
-                           "Use the '-sysdir' command line parameter or "
-                           "set the environment variable LYX_DIR_14x to "
-                           "the LyX system directory containing the file "
-                           "`chkconfig.ltx'."),
-                         searched_dirs_str)
+       // FIXME UNICODE
+       lyxerr << lyx::to_utf8(bformat(_("Unable to determine the system directory "
+                                        "having searched\n"
+                                        "\t%1$s\n"
+                                        "Use the '-sysdir' command line parameter or "
+                                        "set the environment variable LYX_DIR_14x to "
+                                        "the LyX system directory containing the file "
+                                        "`chkconfig.ltx'."),
+                         lyx::from_utf8(searched_dirs_str)))
               << std::endl;
 
        bail_out();
@@ -646,9 +644,11 @@ bool check_command_line_dir(string const & dir,
 {
        string const abs_path = fileSearch(dir, file);
        if (abs_path.empty()) {
-               lyxerr << bformat(_("Invalid %1$s switch.\n"
-                                   "Directory %2$s does not contain %3$s."),
-                                 command_line_switch, dir, file)
+               // FIXME UNICODE
+               lyxerr << lyx::to_utf8(bformat(_("Invalid %1$s switch.\n"
+                                                "Directory %2$s does not contain %3$s."),
+                                 lyx::from_utf8(command_line_switch), lyx::from_utf8(dir),
+                                 lyx::from_utf8(file)))
                       << std::endl;
        }
 
@@ -672,9 +672,10 @@ bool check_env_var_dir(string const & dir,
 {
        string const abs_path = fileSearch(dir, file);
        if (abs_path.empty()) {
-               lyxerr << bformat(_("Invalid %1$s environment variable.\n"
-                                   "Directory %2$s does not contain %3$s."),
-                                 env_var, dir, file)
+               // FIXME UNICODE
+               lyxerr << lyx::to_utf8(bformat(_("Invalid %1$s environment variable.\n"
+                                                "Directory %2$s does not contain %3$s."),
+                                 lyx::from_utf8(env_var), lyx::from_utf8(dir), lyx::from_utf8(file)))
                       << std::endl;
        }
 
@@ -694,10 +695,11 @@ bool check_env_var_dir(string const & dir,
                // search mechanism in po/Makefile.in.in will register
                // package.C.in as a file containing strings that need
                // translation.
-               string const fmt =
-               _("Invalid %1$s environment variable.\n%2$s is not a directory.");
+               // FIXME UNICODE
+               docstring const fmt =
+                       _("Invalid %1$s environment variable.\n%2$s is not a directory.");
 
-               lyxerr << bformat(fmt, env_var, dir)
+               lyxerr << lyx::to_utf8(bformat(fmt, lyx::from_utf8(env_var), lyx::from_utf8(dir)))
                       << std::endl;
        }