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 +-
 src/servermain.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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;
diff --git a/src/servermain.cpp b/src/servermain.cpp
index 146c548c5..b8fb9ba2b 100644
--- a/src/servermain.cpp
+++ b/src/servermain.cpp
@@ -162,7 +162,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 3715e39e5d5cd4a404a5286a9b16f896a64acf6a Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sun, 24 Jul 2011 18:34:10 +0200
Subject: Actually make USE_GETTEXT available in the source

---
 src/cmake_config.h.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in
index 6a8f93bac..7cbb11f6b 100644
--- a/src/cmake_config.h.in
+++ b/src/cmake_config.h.in
@@ -6,6 +6,7 @@
 #define PROJECT_NAME "@PROJECT_NAME@"
 #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 #define VERSION_STRING "@VERSION_STRING@"
+#define USE_GETTEXT @USE_GETTEXT@
 #ifdef NDEBUG
 	#define BUILD_TYPE "Release"
 #else
-- 
cgit v1.2.3


From a8e493122e436b3202b266db23e200e764bdabc5 Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sun, 24 Jul 2011 19:13:30 +0200
Subject: Read config from gettext.h

Otherwise the USE_GETTEXT define might not be visible.
---
 src/gettext.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/gettext.h b/src/gettext.h
index 7c3a6ffab..493f9b21b 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,3 +1,5 @@
+#include "config.h" // for USE_GETTEXT
+
 #if USE_GETTEXT
 #include <libintl.h>
 #else
-- 
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

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

(limited to 'src')

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