chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pam: optionally keep processes of root user around
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 6a688b868730ed37fd3f5139d29c50473fe1fd2b..b594b65387441338a35ee169e0f005b7c9230b02 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-76,12
+76,19
@@
AM_CPPFLAGS += \
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
+if TARGET_FRUGALWARE
+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
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
endif
endif
+endif
rootbin_PROGRAMS = \
systemd \
rootbin_PROGRAMS = \
systemd \
@@
-334,12
+341,6
@@
dist_systemunit_DATA += \
units/fedora/plymouth-halt.service
endif
units/fedora/plymouth-halt.service
endif
-
-if TARGET_ARCH
-dist_systemunit_DATA += \
- units/arch/rc-local.service
-endif
-
dist_doc_DATA = \
README \
LICENSE \
dist_doc_DATA = \
README \
LICENSE \
@@
-625,7
+626,8
@@
test_env_replace_LDADD = \
libsystemd-basic.la
test_strv_SOURCES = \
libsystemd-basic.la
test_strv_SOURCES = \
- src/test-strv.c
+ src/test-strv.c \
+ src/specifier.c
test_strv_CFLAGS = \
$(AM_CFLAGS)
test_strv_CFLAGS = \
$(AM_CFLAGS)