chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: split fsck.target from sysinit.target for suse compat
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 0c3262e02ee5bd491f72b952a8a6d5cd6a067690..3c54043975133efb0eb1808be19043d54e0f0f61 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-58,7
+58,6
@@
rootbin_PROGRAMS = \
systemd-notify
bin_PROGRAMS = \
systemd-notify
bin_PROGRAMS = \
- systemd-install \
systemd-cgls
if HAVE_GTK
systemd-cgls
if HAVE_GTK
@@
-196,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
@@
-325,7
+325,6
@@
MANPAGES = \
man/systemd.1 \
man/systemctl.1 \
man/systemadm.1 \
man/systemd.1 \
man/systemctl.1 \
man/systemadm.1 \
- man/systemd-install.1 \
man/systemd-cgls.1 \
man/systemd-notify.1 \
man/sd_notify.3 \
man/systemd-cgls.1 \
man/systemd-notify.1 \
man/sd_notify.3 \
@@
-494,6
+493,8
@@
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
src/dbus-common.c \
src/systemctl.c \
src/utmp-wtmp.c \
src/dbus-common.c \
+ src/path-lookup.c \
+ src/sd-daemon.c \
src/cgroup-show.c \
src/cgroup-util.c
src/cgroup-show.c \
src/cgroup-util.c
@@
-512,20
+513,6
@@
systemd_notify_SOURCES = \
systemd_notify_LDADD = \
libsystemd-basic.la
systemd_notify_LDADD = \
libsystemd-basic.la
-systemd_install_SOURCES = \
- src/install.c \
- src/path-lookup.c \
- src/dbus-common.c \
- src/sd-daemon.c
-
-systemd_install_LDADD = \
- libsystemd-basic.la \
- $(DBUS_LIBS)
-
-systemd_install_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
systemd_cgls_SOURCES = \
src/cgls.c \
src/cgroup-show.c \
systemd_cgls_SOURCES = \
src/cgls.c \
src/cgroup-show.c \
@@
-801,6
+788,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) \