X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FPackage.h;h=d6e76fb56b99aa892a6edb0bfafb37a443a9af4a;hb=0c1c13bbd0bd6b70ccec79f7ae68e230d3e46a57;hp=b8eb197fc4ef1d02fb420ca8a881f21be5112a34;hpb=97a5c0882d0890999422e2f339b5dc66693800ee;p=lyx.git

diff --git a/src/support/Package.h b/src/support/Package.h
index b8eb197fc4..d6e76fb56b 100644
--- a/src/support/Package.h
+++ b/src/support/Package.h
@@ -25,14 +25,6 @@ namespace support {
 
 class Package;
 
-/** When run in-place <build-dir>/src/lyx is one level up from
- *  the <build-dir> whilst <build-dir>/src/tex2lyx/tex2lyx is
- *  two levels up.
- */
-enum exe_build_dir_to_top_build_dir {
-	top_build_dir_is_one_level_up,
-	top_build_dir_is_two_levels_up
-};
 
 
 /** Initialise package() with the command line data.
@@ -49,10 +41,7 @@ enum exe_build_dir_to_top_build_dir {
  */
 void init_package(std::string const & command_line_arg0,
 		  std::string const & command_line_system_support_dir,
-		  std::string const & command_line_user_support_dir,
-		  exe_build_dir_to_top_build_dir);
-
-bool packageInitialized();
+		  std::string const & command_line_user_support_dir);
 
 /** Accessor to the global data.
  *  Asserts that init_package() has been called first.
@@ -69,8 +58,7 @@ public:
 	 */
 	Package(std::string const & command_line_arg0,
 		std::string const & command_line_system_support_dir,
-		std::string const & command_line_user_support_dir,
-		exe_build_dir_to_top_build_dir);
+		std::string const & command_line_user_support_dir);
 
 	/** The directory containing the main executable (LyX or tex2lyx).
 	 */
@@ -138,7 +126,7 @@ public:
 	 *  for the dump.
 	 *  This may be empty (e. g. when run under a CGI environment)
 	 */
-	FileName const & home_dir() const { return home_dir_; }
+	static FileName const & get_home_dir();
 
 	/** Command to run the configure script.
 	 *  Caution: This is "ready-to-run", i.e. in the locale encoding, not
@@ -157,7 +145,6 @@ private:
 	mutable FileName document_dir_;
 	mutable FileName temp_dir_;
 	FileName system_temp_dir_;
-	FileName home_dir_;
 	std::string configure_command_;
 	bool explicit_user_support_dir_;
 };