chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: there might be names already registered before we can connect, make sure to...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d752ec58c248c2bd97bcba085f459565e00f2968..28e52fee2fa7d709b7045e08bbadf2118f245311 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-87,6
+87,7
@@
interface_DATA = \
dist_systemunit_DATA = \
units/emergency.service \
dist_systemunit_DATA = \
units/emergency.service \
+ units/basic.target \
units/getty.target \
units/halt.target \
units/local-fs.target \
units/getty.target \
units/halt.target \
units/local-fs.target \
@@
-119,7
+120,7
@@
dist_systemunit_DATA = \
units/var-run.mount
systemunit_DATA = \
units/var-run.mount
systemunit_DATA = \
- units/
basic
.target \
+ units/
sysinit
.target \
units/getty@.service \
units/graphical.target \
units/multi-user.target \
units/getty@.service \
units/graphical.target \
units/multi-user.target \
@@
-135,7
+136,7
@@
sessionunit_DATA = \
units/session/exit.service
EXTRA_DIST = \
units/session/exit.service
EXTRA_DIST = \
- units/
basic
.target.m4 \
+ units/
sysinit
.target.m4 \
units/getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
units/getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
@@
-288,7
+289,7
@@
test_engine_LDADD = $(systemd_LDADD)
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
- src/test-
engin
e.c
+ src/test-
job-typ
e.c
test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
test_job_type_LDADD = $(systemd_LDADD)
test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
test_job_type_LDADD = $(systemd_LDADD)
@@
-368,11
+369,10
@@
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
- -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
- -e 's,@SYSTEMCTL\@,$(bindir)/systemctl,g' \
+ -e 's,@SYSTEMCTL\@,$(
root
bindir)/systemctl,g' \
< $< > $@
units/%: units/%.in Makefile
< $< > $@
units/%: units/%.in Makefile
@@
-399,7
+399,7
@@
CLEANFILES = \
units/systemd-initctl.service \
units/systemd-logger.service \
units/syslog.target \
units/systemd-initctl.service \
units/systemd-logger.service \
units/syslog.target \
- units/
basic
.target \
+ units/
sysinit
.target \
units/getty@.service \
units/graphical.target \
units/multi-user.target \
units/getty@.service \
units/graphical.target \
units/multi-user.target \
@@
-471,7
+471,7
@@
install-data-hook:
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
- $(DESTDIR)$(systemunitdir)/
basic
.target.wants \
+ $(DESTDIR)$(systemunitdir)/
sysinit
.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
@@
-517,9
+517,10
@@
install-data-hook:
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
- rm -f getty.target && \
- $(LN_S) $(systemunitdir)/getty.target getty.target )
- ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+ rm -f getty.target remote-fs.target && \
+ $(LN_S) $(systemunitdir)/getty.target getty.target && \
+ $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \