Add packaging support for Haiku

[features.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 251fe2d65bc4c08ed4b377a715ee407ad3db07db..d70c6b02238fd4d230e4026969369f581a2f1f49 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -175,8 +175,6 @@ struct LyX::Impl {
        ///
        Movers system_movers_;
 
-       /// has this user started lyx for the first time?
-//     bool first_start;
        /// the parsed command line batch command if any
        vector<string> batch_commands;
 
@@ -472,9 +470,9 @@ int LyX::execWithoutGui(int & argc, char * argv[])
 {
        int exit_status = init(argc, argv);
        if (exit_status) {
-               prepareExit(); 
-               return exit_status;   
-       }                      
+               prepareExit();
+               return exit_status;
+       }
 
        // this is correct, since return values are inverted.
        exit_status = !loadFiles();
@@ -764,7 +762,7 @@ void cleanDuplicateEnvVars()
 
        // Loop over the list of duplicated variables
        std::set<std::string>::iterator dupe = dupes.begin();
-       std::set<std::string>::iterator const dend = dupes.end();       
+       std::set<std::string>::iterator const dend = dupes.end();
        for (; dupe != dend; ++dupe) {
                const char *name = (*dupe).c_str();
                char *val = getenv(name);
@@ -835,7 +833,7 @@ bool LyX::init()
                return false;
 
        // Set the PATH correctly.
-#if !defined (USE_POSIX_PACKAGING)
+#if !defined (USE_POSIX_PACKAGING) && !defined (USE_HAIKU_PACKAGING)
        // Add the directory containing the LyX executable to the path
        // so that LyX can find things like tex2lyx.
        if (package().build_support().empty())
@@ -1149,8 +1147,6 @@ int parse_version(string const &, string const &, string &)
        if (string(lyx_git_commit_hash) != "none")
                cout << to_utf8(_("  Git commit hash "))
                     << string(lyx_git_commit_hash).substr(0,8) << endl;
-       cout << to_utf8(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
-               from_ascii(lyx_build_date), from_ascii(lyx_build_time))) << endl;
        cout << lyx_version_info << endl;
        exit(0);
        return 0;
@@ -1303,7 +1299,7 @@ void LyX::easyParse(int & argc, char * argv[])
        cmdmap["-userdir"] = parse_userdir;
        cmdmap["-x"] = parse_execute;
        cmdmap["--execute"] = parse_execute;
-       cmdmap["-e"] = parse_export;
+       cmdmap["-e"] = parse_export;
        cmdmap["--export"] = parse_export;
        cmdmap["-E"] = parse_export_to;
        cmdmap["--export-to"] = parse_export_to;