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 da36a8c1c20ebe692abbe8bbe7d9c48bf88dcaf0..5fa4e4a5e88d3c0ab3bb5ed56533cf358ee81c92 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3025,9 +3025,7 @@ noinst_PROGRAMS += \
        systemd-modeset \
        systemd-subterm
 
        systemd-modeset \
        systemd-subterm
 

-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \

        src/libsystemd-terminal/unifont-glyph-array.bin
 
 tests += \
        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 7a0d48505ac96bd25c4c2c46e666e6c2485395db..2b0b859eb095d5d62631ac18dbf03243fa4cca42 100644 (file)
--- 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 */
  */
 
 /* 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
 
 /* header-size of version 1 */
 #define UNIFONT_HEADER_SIZE_MIN 32