From: David Herrmann <dh.herrmann@gmail.com>
Date: Wed, 1 Oct 2014 09:25:27 +0000 (+0200)
Subject: terminal: move unifont-map to datadir
X-Git-Tag: v217~378
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=056e86ee7fdae86d358aa068303845dff2cbb598;ds=sidebyside

terminal: move unifont-map to datadir

Lets avoid putting stuff into /usr/shared/unifont/, but keep it in
/usr/share/systemd/. Upstream lacks interest in this, so don't bother for
now.
---

diff --git a/Makefile.am b/Makefile.am
index da36a8c1c..5fa4e4a5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3025,9 +3025,7 @@ noinst_PROGRAMS += \
 	systemd-modeset \
 	systemd-subterm
 
-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \
 	src/libsystemd-terminal/unifont-glyph-array.bin
 
 tests += \
diff --git a/src/libsystemd-terminal/unifont-def.h b/src/libsystemd-terminal/unifont-def.h
index 7a0d48505..2b0b859eb 100644
--- a/src/libsystemd-terminal/unifont-def.h
+++ b/src/libsystemd-terminal/unifont-def.h
@@ -115,7 +115,7 @@ typedef struct unifont_glyph_header unifont_glyph_header;
  */
 
 /* path to binary file */
-#define UNIFONT_PATH "/usr/share/unifont/unifont-glyph-array.bin"
+#define UNIFONT_PATH "/usr/share/systemd/unifont-glyph-array.bin"
 
 /* header-size of version 1 */
 #define UNIFONT_HEADER_SIZE_MIN 32