From 1b8cff8fbf6a1ae121bba93b12318a6f20f1daad Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 2 Jun 2011 19:30:03 +0300
Subject: [PATCH] In a globally installed build, debug.txt is now placed in
 userdata directory. Needs testing still.

---
 CMakeLists.txt     |  2 +-
 src/main.cpp       | 37 ++++++++++++++++++++++---------------
 src/servermain.cpp | 38 +++++++++++++++++++++++---------------
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1074e6d3..9cb6db41f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(minetest)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110602_0)
+set(VERSION_PATCH 20110602_1_dev)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
diff --git a/src/main.cpp b/src/main.cpp
index 2cde3b302..881aa9bf7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1028,6 +1028,15 @@ void drawMenuBackground(video::IVideoDriver* driver)
 
 int main(int argc, char *argv[])
 {
+	/*
+		Initialization
+	*/
+
+	// Set locale. This is for forcing '.' as the decimal point.
+	std::locale::global(std::locale("C"));
+	// This enables printing all characters in bitmap font
+	setlocale(LC_CTYPE, "en_US");
+
 	/*
 		Parse command line
 	*/
@@ -1091,21 +1100,28 @@ int main(int argc, char *argv[])
 		disable_stderr = true;
 #endif
 
+	porting::signal_handler_init();
+	bool &kill = *porting::signal_handler_killstatus();
+	
+	// Initialize porting::path_data and porting::path_userdata
+	porting::initializePaths();
+
 	// Initialize debug streams
-	debugstreams_init(disable_stderr, DEBUGFILE);
+#ifdef RUN_IN_PLACE
+	std::string debugfile = DEBUGFILE;
+#else
+	std::string debugfile = porting::path_userdata+"/"+DEBUGFILE;
+#endif
+	debugstreams_init(disable_stderr, debugfile.c_str());
 	// Initialize debug stacks
 	debug_stacks_init();
 
 	DSTACK(__FUNCTION_NAME);
 
-	porting::signal_handler_init();
-	bool &kill = *porting::signal_handler_killstatus();
-	
-	porting::initializePaths();
 	// Create user data directory
 	fs::CreateDir(porting::path_userdata);
 	
-	// C-style stuff initialization
+	// Init material properties table
 	initializeMaterialProperties();
 
 	// Debug handler
@@ -1124,19 +1140,10 @@ int main(int argc, char *argv[])
 	// Initialize default settings
 	set_default_settings();
 	
-	// Set locale. This is for forcing '.' as the decimal point.
-	std::locale::global(std::locale("C"));
-	// This enables printing all characters in bitmap font
-	setlocale(LC_CTYPE, "en_US");
-
 	// Initialize sockets
 	sockets_init();
 	atexit(sockets_cleanup);
 	
-	/*
-		Initialization
-	*/
-
 	/*
 		Read config file
 	*/
diff --git a/src/servermain.cpp b/src/servermain.cpp
index f83e2ae76..907d0d2db 100644
--- a/src/servermain.cpp
+++ b/src/servermain.cpp
@@ -115,6 +115,15 @@ u32 getTimeMs()
 
 int main(int argc, char *argv[])
 {
+	/*
+		Initialization
+	*/
+
+	// Set locale. This is for forcing '.' as the decimal point.
+	std::locale::global(std::locale("C"));
+	// This enables printing all characters in bitmap font
+	setlocale(LC_CTYPE, "en_US");
+
 	/*
 		Low-level initialization
 	*/
@@ -124,20 +133,28 @@ int main(int argc, char *argv[])
 	disable_stderr = true;
 #endif
 
+	porting::signal_handler_init();
+	bool &kill = *porting::signal_handler_killstatus();
+	
+	// Initialize porting::path_data and porting::path_userdata
+	porting::initializePaths();
+
 	// Initialize debug streams
-	debugstreams_init(disable_stderr, DEBUGFILE);
+#ifdef RUN_IN_PLACE
+	std::string debugfile = DEBUGFILE;
+#else
+	std::string debugfile = porting::path_userdata+"/"+DEBUGFILE;
+#endif
+	debugstreams_init(disable_stderr, debugfile.c_str());
 	// Initialize debug stacks
 	debug_stacks_init();
 
 	DSTACK(__FUNCTION_NAME);
 
-	porting::signal_handler_init();
-	bool &kill = *porting::signal_handler_killstatus();
-	
-	porting::initializePaths();
-
+	// Init material properties table
 	initializeMaterialProperties();
 
+	// Debug handler
 	BEGIN_DEBUG_EXCEPTION_HANDLER
 
 	// Print startup message
@@ -202,19 +219,10 @@ int main(int argc, char *argv[])
 	// Initialize default settings
 	set_default_settings();
 	
-	// Set locale. This is for forcing '.' as the decimal point.
-	std::locale::global(std::locale("C"));
-	// This enables printing all characters in bitmap font
-	setlocale(LC_CTYPE, "en_US");
-
 	// Initialize sockets
 	sockets_init();
 	atexit(sockets_cleanup);
 	
-	/*
-		Initialization
-	*/
-
 	/*
 		Read config file
 	*/