chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: automatically spawn temporary password agent when we might need one
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 77d1fc938ffcf3f2d4cfa6a2e917d1e5e9a99f3b..b005f3aa6784117d7a009228495548f65e76b303 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-53,9
+53,10
@@
AM_CPPFLAGS = \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
+ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
- -DKEXEC_BINARY_PATH=\"
$(rootsbindir)
/kexec\" \
+ -DKEXEC_BINARY_PATH=\"
/sbin
/kexec\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
-I $(top_srcdir)/src
if TARGET_GENTOO
@@
-210,7
+211,8
@@
dist_systemunit_DATA = \
units/systemd-readahead-done.timer \
units/systemd-tmpfiles-clean.timer \
units/quotaon.service \
units/systemd-readahead-done.timer \
units/systemd-tmpfiles-clean.timer \
units/quotaon.service \
- units/systemd-ask-password-wall.path
+ units/systemd-ask-password-wall.path \
+ units/systemd-ask-password-plymouth.path
nodist_systemunit_DATA = \
units/sysinit.target \
nodist_systemunit_DATA = \
units/sysinit.target \
@@
-237,6
+239,7
@@
nodist_systemunit_DATA = \
units/systemd-tmpfiles-clean.service \
units/systemd-user-sessions.service \
units/systemd-ask-password-wall.service \
units/systemd-tmpfiles-clean.service \
units/systemd-user-sessions.service \
units/systemd-ask-password-wall.service \
+ units/systemd-ask-password-plymouth.service \
units/syslog.target \
units/halt.service \
units/poweroff.service \
units/syslog.target \
units/halt.service \
units/poweroff.service \
@@
-279,6
+282,7
@@
EXTRA_DIST = \
units/systemd-tmpfiles-clean.service.in \
units/systemd-user-sessions.service.in \
units/systemd-ask-password-wall.service.in \
units/systemd-tmpfiles-clean.service.in \
units/systemd-user-sessions.service.in \
units/systemd-ask-password-wall.service.in \
+ units/systemd-ask-password-plymouth.service.in \
units/syslog.target.in \
units/halt.service.in \
units/poweroff.service.in \
units/syslog.target.in \
units/halt.service.in \
units/poweroff.service.in \
@@
-303,19
+307,13
@@
dist_systemunit_DATA += \
units/fedora/plymouth-halt.service
endif
units/fedora/plymouth-halt.service
endif
-if TARGET_DEBIAN
+if TARGET_DEBIAN
_OR_UBUNTU
dist_systemunit_DATA += \
dist_systemunit_DATA += \
- units/debian/fsck.target \
units/debian/umountfs.service \
units/debian/umountnfs.service \
units/debian/umountroot.service
endif
units/debian/umountfs.service \
units/debian/umountnfs.service \
units/debian/umountroot.service
endif
-if TARGET_SUSE
-dist_systemunit_DATA += \
- units/suse/fsck.target
-endif
-
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
@@
-323,7
+321,6
@@
endif
if TARGET_ARCH
dist_systemunit_DATA += \
if TARGET_ARCH
dist_systemunit_DATA += \
- units/arch/sysinit.service \
units/arch/rc-local.service
endif
units/arch/rc-local.service
endif
@@
-1193,8
+1190,9
@@
if TARGET_FEDORA
rm -f single.service && \
$(LN_S) $(systemunitdir)/single.service single.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f single.service && \
$(LN_S) $(systemunitdir)/single.service single.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f plymouth-quit.service && \
- $(LN_S) ../plymouth-quit.service plymouth-quit.service )
+ rm -f plymouth-quit.service systemd-ask-password-plymouth.path && \
+ $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+ $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
@@
-1218,7
+1216,7
@@
if TARGET_GENTOO
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
-if TARGET_DEBIAN
+if TARGET_DEBIAN
_OR_UBUNTU
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/umount.target.wants
( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/umount.target.wants
( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
@@
-1230,13
+1228,6
@@
if TARGET_DEBIAN
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
endif
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
endif
-if !TARGET_SUSE
-if !TARGET_DEBIAN
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f fsck.target && \
- $(LN_S) sysinit.target fsck.target )
-endif
-endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \