From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Thu, 7 Oct 2010 17:00:23 +0000 (-0300)
Subject: vconsole-setup: fix path on Arch
X-Git-Tag: v12~277
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c226fa4196aacf44a2aa9ebbd222161f79c2f070;p=systemd

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.
---

diff --git a/Makefile.am b/Makefile.am
index 4307db1a..4b248c0f 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 \