suse: locale + vconsole compat support

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aa4798d83e1fec4be72933782dd0506d9a9221cd..f57482a15bc5eae40b7dfe0856bdfac3192a276a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,18 @@ AM_CPPFLAGS = \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -I $(top_srcdir)/src
 
+if TARGET_GENTOO
+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
+
 rootbin_PROGRAMS = \
        systemd \
        systemctl \
@@ -171,7 +183,9 @@ dist_systemunit_DATA = \
        units/remount-rootfs.service \
        units/printer.target \
        units/bluetooth.target \
-       units/smartcard.target
+       units/smartcard.target \
+       units/tmpwatch.service \
+       units/tmpwatch.timer
 
 nodist_systemunit_DATA = \
        units/sysinit.target \
@@ -967,12 +981,16 @@ install-data-hook:
                        dev-mqueue.automount \
                        proc-sys-fs-binfmt_misc.automount \
                        sys-kernel-debug.automount \
-                       sys-kernel-security.automount && \
+                       sys-kernel-security.automount \
+                       tmpwatch.timer \
+                       tmpwatch.service && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
                $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
-               $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount )
+               $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+               $(LN_S) ../tmpwatch.timer && \
+               $(LN_S) ../tmpwatch.service )
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )