From 423109e64c9e723f9f2a52e3537892f584383865 Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sun, 24 Jul 2011 18:12:11 +0200
Subject: Two more instances of unhardcoding the project name

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index bdfbc35f7..0001d33ec 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1153,7 +1153,7 @@ int main(int argc, char *argv[])
 	BEGIN_DEBUG_EXCEPTION_HANDLER
 
 	// Print startup message
-	dstream<<DTIME<<"minetest-c55"
+	dstream<<DTIME<<PROJECT_NAME <<
 			" with SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
 			<<", "<<BUILD_INFO
 			<<std::endl;
-- 
cgit v1.2.3


From cce210f6768ab9960248f07d2b203dfae660daac Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sun, 24 Jul 2011 19:20:40 +0200
Subject: Locale dir should be parallel to global data dir

---
 cmake/Modules/FindGettextLib.cmake | 2 +-
 src/main.cpp                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.cpp')

diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
index a215f3f8d..18935eaad 100644
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/cmake/Modules/FindGettextLib.cmake
@@ -56,7 +56,7 @@ ENDIF()
 IF(GETTEXT_FOUND)
 	SET(GETTEXT_PO_PATH ${CMAKE_SOURCE_DIR}/po)
 	SET(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale/<locale>/LC_MESSAGES)
-	SET(GETTEXT_MO_DEST_PATH locale/<locale>/LC_MESSAGES)
+	SET(GETTEXT_MO_DEST_PATH ${DATADIR}/../locale/<locale>/LC_MESSAGES)
 	FILE(GLOB GETTEXT_AVAILABLE_LOCALES RELATIVE ${GETTEXT_PO_PATH} "${GETTEXT_PO_PATH}/*")
 	LIST(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES minetest.pot)
 	MACRO(SET_MO_PATHS _buildvar _destvar _locale)
diff --git a/src/main.cpp b/src/main.cpp
index 0001d33ec..bcca60d95 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1132,7 +1132,7 @@ int main(int argc, char *argv[])
 	// Create user data directory
 	fs::CreateDir(porting::path_userdata);
 
-	init_gettext((porting::path_userdata+"/locale").c_str());
+	init_gettext((porting::path_data+"/../locale").c_str());
 
 	// Initialize debug streams
 #ifdef RUN_IN_PLACE
-- 
cgit v1.2.3