* lyxfunctional.h: delete compare_memfun and helper classes

[lyx.git] / src / support / path_defines.h

diff --git a/src/support/path_defines.h b/src/support/path_defines.h
index 4846c2af35d370394c53e930d5aaa87de027f45c..97dfc3a8ca46d14db1350b6a81164d521f9d207d 100644 (file)
--- a/src/support/path_defines.h
+++ b/src/support/path_defines.h
@@ -6,35 +6,39 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef PATH_DEFINES_H
 #define PATH_DEFINES_H
 
-#include "LString.h"
+#include <string>
+
 
 namespace lyx {
 namespace support {
 
-string const & lyx_localedir();
+std::string const & lyx_localedir();
 
-/* The absolute path to the lyx build directory.
+/* The absolute path to the top of the lyx build tree.
  * (Make-time value.)
  */
-string const & build_lyxdir();
+std::string const & top_srcdir();
 
 /// The absolute path to the lyx support files we're actually going to use.
-string const & system_lyxdir();
+std::string const & system_lyxdir();
 
 /// Set the absolute path to the lyx support files (from the command line).
-void system_lyxdir(string const &);
+void system_lyxdir(std::string const &);
+
+/// The absolute path to the lyx support files in the build directory
+std::string const & build_lyxdir();
 
 /// The absolute path to the user-level lyx support files.
-string const & user_lyxdir();
+std::string const & user_lyxdir();
 
 /// Set the absolute path to the user-level lyx support files.
-void user_lyxdir(string const &);
+void user_lyxdir(std::string const &);
 
 /** \returns true if the user lyx dir existed already and did not need
  *  to be created afresh.