chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vconsole-setup: fix path on Arch
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 11abadffe333d453021011671f7c669799699839..4b248c0fc5412d57ef768a0e3d49a55e4446ec6d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-61,11
+61,18
@@
AM_CPPFLAGS += \
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
-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
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
endif
+endif
rootbin_PROGRAMS = \
systemd \
rootbin_PROGRAMS = \
systemd \
@@
-456,6
+463,7
@@
MANPAGES = \
man/systemd.exec.5 \
man/daemon.7 \
man/sd-daemon.7 \
man/systemd.exec.5 \
man/daemon.7 \
man/sd-daemon.7 \
+ man/sd-readahead.7 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
@@
-699,7
+707,8
@@
systemctl_SOURCES = \
src/sd-daemon.c \
src/cgroup-show.c \
src/cgroup-util.c \
src/sd-daemon.c \
src/cgroup-show.c \
src/cgroup-util.c \
- src/exit-status.c
+ src/exit-status.c \
+ src/unit-name.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemctl_CFLAGS = \
$(AM_CFLAGS) \