Angus Leeming <[EMAIL PROTECTED]> writes: | @@ -217,8 +217,19 @@ bool setLyxPaths() | bool followlink; | do { | // Path of binary/../share/name of binary/ | - searchpath += NormalizePath(AddPath(binpath, "../share/") + | - OnlyFilename(binname)) + ';'; | + | + string const exe_name = OnlyFilename(binname); | + string const lyx_system_dir_name = | +#ifdef _WIN32 | + suffixIs(exe_name, ".exe") ? | + ChangeExtension(exe_name, "") : | + exe_name; | +#else | + exe_name; | +#endif
Can we please not split statements with ifdef? | +#ifdef _WIN32 | + string const lyx_system_dir_name = | + suffixIs(exe_name, ".exe") ? | + ChangeExtension(exe_name, "") : | + exe_name; | +#else | + string const lyx_system_dir_name = exe_name; | +#endif would be nicer. -- Lgb