summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2010-10-07 14:00:23 -0300
committerLennart Poettering <lennart@poettering.net>2010-10-07 19:13:54 +0200
commitc226fa4196aacf44a2aa9ebbd222161f79c2f070 (patch)
treefc1639585ef77562500305a7ec4589b5fdcf8b01
parentb7f426649b0ff4ea37ebe41f16ddeb42f1defc15 (diff)
vconsole-setup: fix path on Arch
Arch uses the same paths and default font of gentoo. Previously, systemd-vconsole-setup was failing with the following message: systemd-vconsole-setup[59]: /bin/setfont failed with error code 1.
-rw-r--r--Makefile.am7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 4307db1a69..4b248c0fc5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,11 +61,18 @@ AM_CPPFLAGS += \
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
+if TARGET_ARCH
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
endif
+endif
rootbin_PROGRAMS = \
systemd \