chiark / gitweb /
terminal: move unifont-map to datadir
authorDavid Herrmann <dh.herrmann@gmail.com>
Wed, 1 Oct 2014 09:25:27 +0000 (11:25 +0200)
committerDavid Herrmann <dh.herrmann@gmail.com>
Thu, 2 Oct 2014 06:40:43 +0000 (08:40 +0200)
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.

Makefile.am
src/libsystemd-terminal/unifont-def.h

index da36a8c..5fa4e4a 100644 (file)
@@ -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 += \
index 7a0d485..2b0b859 100644 (file)
@@ -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