chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: when two pending jobs conflict, keep the one that "conflicts", remove the...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index bebfd2f7370a9ef35be9218c02a1da9a04605edd..00765a7c3ef143f8ef8d44adafa8fd2f4fcb6555 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-195,7
+195,8
@@
if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/halt.service \
units/suse/poweroff.service \
dist_systemunit_DATA += \
units/suse/halt.service \
units/suse/poweroff.service \
- units/suse/reboot.service
+ units/suse/reboot.service \
+ units/suse/fsck.target
endif
if TARGET_GENTOO
endif
if TARGET_GENTOO
@@
-478,7
+479,8
@@
systemd_initctl_LDADD = \
$(DBUS_LIBS)
systemd_cgroups_agent_SOURCES = \
$(DBUS_LIBS)
systemd_cgroups_agent_SOURCES = \
- src/cgroups-agent.c
+ src/cgroups-agent.c \
+ src/dbus-common.c
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
@@
-787,6
+789,11
@@
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_SUSE
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f fsck.target && \
+ $(LN_S) sysinit.target fsck.target )
+endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \