summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-04 13:17:38 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-04 22:18:26 +0100
commit5cffb54e48034b0bc7bce2ae9a61ce4a24464e63 (patch)
tree9e436425a3d8a417f0177e47557dcf5edf1cc91f /data
parentad276ae0d4679aee9d7e6082fa602b49c6fd940a (diff)
downloadmana-5cffb54e48034b0bc7bce2ae9a61ce4a24464e63.tar.gz
mana-5cffb54e48034b0bc7bce2ae9a61ce4a24464e63.tar.bz2
mana-5cffb54e48034b0bc7bce2ae9a61ce4a24464e63.tar.xz
mana-5cffb54e48034b0bc7bce2ae9a61ce4a24464e63.zip
Fixed installing of dejavusans.ttf font.
(cherry picked from mainline commit 8d1299338e033e1de539dae36856e365855fabc1) Conflicts: src/gui/gui.cpp
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/fonts/Makefile.am5
2 files changed, 6 insertions, 1 deletions
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)