Fixed installing of dejavusans.ttf font.

(cherry picked from mainline commit 8d1299338e033e1de539dae36856e365855fabc1)

Conflicts:

	src/gui/gui.cpp

4 files changed, 11 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 556f6beb..791a84c5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,7 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 data/Makefile
+data/fonts/Makefile
 data/graphics/Makefile
 data/graphics/gui/Makefile
 data/graphics/images/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 5a28f7c1..62672207 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
 
-SUBDIRS = graphics help icons
+SUBDIRS = fonts graphics help icons
 
 tmwdatadir = $(pkgdatadir)/data
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
new file mode 100644
index 00000000..331f6c8b
--- /dev/null
+++ b/data/fonts/Makefile.am
@@ -0,0 +1,5 @@
+fontsdir = $(pkgdatadir)/data/fonts
+
+fonts_DATA = dejavusans.ttf
+
+EXTRA_DIST = $(fonts_DATA)
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4052951f..61da1a0c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -106,9 +106,11 @@ Gui::Gui(Graphics *graphics):
     Window::setWindowContainer(guiTop);
     setTop(guiTop);
 
-    // Set global font (based on ISO-8859-15)
+    // Set global font
+    ResourceManager *resman = ResourceManager::getInstance();
+    std::string path = resman->getPath("fonts/dejavusans.ttf");
     try {
-        mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 11);
+        mGuiFont = new TrueTypeFont(path, 11);
     }
     catch (gcn::Exception e)
     {