[systemd-commits] Makefile.am

[Lennart Poettering]

 Makefile.am |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit c226fa4196aacf44a2aa9ebbd222161f79c2f070
Author: Lucas De Marchi <lucas.demarchi at profusion.mobi>
Date:   Thu Oct 7 14:00:23 2010 -0300

    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 4307db1..4b248c0 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 \